From da72ac964f76f88799e7b0e597b5c3eb52d2fa28 Mon Sep 17 00:00:00 2001 From: aryan Date: Fri, 13 Jun 2025 10:50:47 +0530 Subject: [PATCH 1/3] add android provider --- provider/android/.gitignore | 15 + provider/android/app/.gitignore | 1 + provider/android/app/build.gradle.kts | 94 +++ provider/android/app/proguard-rules.pro | 21 + .../star/provider/ExampleInstrumentedTest.kt | 24 + .../android/app/src/main/AndroidManifest.xml | 46 ++ .../java/com/star/provider/MainActivity.kt | 473 +++++++++++ .../com/star/provider/starProviderService.kt | 779 ++++++++++++++++++ .../java/com/star/provider/ui/theme/Color.kt | 11 + .../java/com/star/provider/ui/theme/Theme.kt | 58 ++ .../java/com/star/provider/ui/theme/Type.kt | 34 + .../res/drawable/ic_launcher_background.xml | 170 ++++ .../res/drawable/ic_launcher_foreground.xml | 30 + .../src/main/res/drawable/ic_stat_name.xml | 12 + .../src/main/res/drawable/ic_voice_config.xml | 12 + .../main/res/mipmap-anydpi/ic_launcher.xml | 6 + .../res/mipmap-anydpi/ic_launcher_round.xml | 6 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../app/src/main/res/values/colors.xml | 10 + .../app/src/main/res/values/strings.xml | 3 + .../app/src/main/res/values/themes.xml | 5 + .../app/src/main/res/xml/backup_rules.xml | 13 + .../main/res/xml/data_extraction_rules.xml | 19 + .../java/com/star/provider/ExampleUnitTest.kt | 17 + provider/android/build.gradle.kts | 33 + provider/android/gradle.properties | 23 + provider/android/gradle/libs.versions.toml | 45 + .../android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + provider/android/gradlew | 249 ++++++ provider/android/gradlew.bat | 92 +++ provider/android/settings.gradle.kts | 31 + 41 files changed, 2339 insertions(+) create mode 100644 provider/android/.gitignore create mode 100644 provider/android/app/.gitignore create mode 100644 provider/android/app/build.gradle.kts create mode 100644 provider/android/app/proguard-rules.pro create mode 100644 provider/android/app/src/androidTest/java/com/star/provider/ExampleInstrumentedTest.kt create mode 100644 provider/android/app/src/main/AndroidManifest.xml create mode 100644 provider/android/app/src/main/java/com/star/provider/MainActivity.kt create mode 100644 provider/android/app/src/main/java/com/star/provider/starProviderService.kt create mode 100644 provider/android/app/src/main/java/com/star/provider/ui/theme/Color.kt create mode 100644 provider/android/app/src/main/java/com/star/provider/ui/theme/Theme.kt create mode 100644 provider/android/app/src/main/java/com/star/provider/ui/theme/Type.kt create mode 100644 provider/android/app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 provider/android/app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 provider/android/app/src/main/res/drawable/ic_stat_name.xml create mode 100644 provider/android/app/src/main/res/drawable/ic_voice_config.xml create mode 100644 provider/android/app/src/main/res/mipmap-anydpi/ic_launcher.xml create mode 100644 provider/android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml create mode 100644 provider/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 provider/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 provider/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 provider/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 provider/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 provider/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 provider/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 provider/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 provider/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 provider/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 provider/android/app/src/main/res/values/colors.xml create mode 100644 provider/android/app/src/main/res/values/strings.xml create mode 100644 provider/android/app/src/main/res/values/themes.xml create mode 100644 provider/android/app/src/main/res/xml/backup_rules.xml create mode 100644 provider/android/app/src/main/res/xml/data_extraction_rules.xml create mode 100644 provider/android/app/src/test/java/com/star/provider/ExampleUnitTest.kt create mode 100644 provider/android/build.gradle.kts create mode 100644 provider/android/gradle.properties create mode 100644 provider/android/gradle/libs.versions.toml create mode 100644 provider/android/gradle/wrapper/gradle-wrapper.jar create mode 100644 provider/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 provider/android/gradlew create mode 100644 provider/android/gradlew.bat create mode 100644 provider/android/settings.gradle.kts diff --git a/provider/android/.gitignore b/provider/android/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/provider/android/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/provider/android/app/.gitignore b/provider/android/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/provider/android/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/provider/android/app/build.gradle.kts b/provider/android/app/build.gradle.kts new file mode 100644 index 0000000..eec0f3c --- /dev/null +++ b/provider/android/app/build.gradle.kts @@ -0,0 +1,94 @@ +// Module-level build file +// build.gradle.kts (Module: app) + +plugins { + // Apply the plugins declared in the root build.gradle.kts + // or directly by their ID if not using the root declaration pattern + id("com.android.application") + id("org.jetbrains.kotlin.android") + // If you had defined an alias for compose, e.g., in libs.versions.toml as + // kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } + // You might also add: id("org.jetbrains.kotlin.plugin.compose") + // However, with modern AGP and composeOptions, it's often implicitly handled. +} + +android { + namespace = "com.star.provider" + compileSdk = 35 + + defaultConfig { + applicationId = "com.star.provider" + minSdk = 32 // Ensure this is appropriate for the APIs used + targetSdk = 35 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + } + + buildTypes { + release { + isMinifyEnabled = false // Set to true for actual releases + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = "1.8" + } + + buildFeatures { + compose = true + } + + composeOptions { + // Ensure this version is compatible with your Kotlin and Compose BOM versions + // Refer to: https://developer.android.com/jetpack/androidx/releases/compose-kotlin + kotlinCompilerExtensionVersion = "1.5.3" // Example, update to your required version + } + + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + // Core Android & Jetpack Compose Dependencies (from version catalog) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) // Ensure this BOM version is up-to-date + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + implementation("androidx.compose.material3:material3:1.2.1") // Or your current M3 version + implementation("androidx.compose.material:material-icons-core:1.6.7") // Or latest + implementation("androidx.compose.material:material-icons-extended:1.6.7") // Or latest - for all icons + // Added Dependencies for STAR Provider Service (explicitly versioned for clarity, or add to TOML) + implementation("com.squareup.okhttp3:okhttp:4.12.0") + implementation("org.json:json:20231013") + implementation("com.google.code.gson:gson:2.10.1") + + // Testing Dependencies (from version catalog) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) // For Compose testing + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) +} \ No newline at end of file diff --git a/provider/android/app/proguard-rules.pro b/provider/android/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/provider/android/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/provider/android/app/src/androidTest/java/com/star/provider/ExampleInstrumentedTest.kt b/provider/android/app/src/androidTest/java/com/star/provider/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..47e44d6 --- /dev/null +++ b/provider/android/app/src/androidTest/java/com/star/provider/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.star.provider + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.star.provider", appContext.packageName) + } +} \ No newline at end of file diff --git a/provider/android/app/src/main/AndroidManifest.xml b/provider/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..93d7db2 --- /dev/null +++ b/provider/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/provider/android/app/src/main/java/com/star/provider/MainActivity.kt b/provider/android/app/src/main/java/com/star/provider/MainActivity.kt new file mode 100644 index 0000000..58d5280 --- /dev/null +++ b/provider/android/app/src/main/java/com/star/provider/MainActivity.kt @@ -0,0 +1,473 @@ +package com.star.provider // Ensure this matches your package name + +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.content.ServiceConnection +import android.content.SharedPreferences +import android.os.Build +import android.os.Bundle +import android.os.IBinder +import android.util.Log +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Build +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.ui.window.Dialog +import androidx.core.content.ContextCompat +import com.star.provider.ui.theme.StarProviderTheme +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import java.util.Locale +import com.star.provider.ServiceStateListener +import com.star.provider.ServiceLogListener +import com.star.provider.PersistedVoiceConfig +import com.star.provider.DialogVoiceInfo +import com.star.provider.DialogEngineInfo + +// SharedPreferences Keys +const val PREFS_NAME = "StarProviderPrefs" +const val KEY_SERVER_URLS = "server_urls" // MODIFIED +const val KEY_PROVIDER_NAME = "provider_name" + +class MainActivity : ComponentActivity(), ServiceStateListener, ServiceLogListener { + + private var starProviderService: StarProviderService? = null + private var serviceBinder: StarProviderService.LocalBinder? = null + private var isBound = false + private lateinit var sharedPreferences: SharedPreferences + + // MODIFIED: From single URL to list of URLs + private val _serverUrls = mutableStateListOf() + private val _providerName = mutableStateOf("MyAndroidTTS") + private val _currentStatus = mutableStateOf("Status: Disconnected") + private val _logMessages = mutableStateOf("Logs will appear here...") + private val _isServiceRunningState = mutableStateOf(false) + private val _showVoiceConfigDialog = mutableStateOf(false) + private val _showEngineConfigDialog = mutableStateOf(false) // NEW + + private val connection = object : ServiceConnection { + override fun onServiceConnected(className: ComponentName, service: IBinder) { + serviceBinder = service as StarProviderService.LocalBinder + starProviderService = serviceBinder?.getService() + isBound = true + Log.d("MainActivity", "Service connected") + serviceBinder?.registerStateListener(this@MainActivity) + serviceBinder?.registerLogListener(this@MainActivity) + starProviderService?.requestCurrentStatus() + } + + override fun onServiceDisconnected(arg0: ComponentName) { + if (isBound) { + serviceBinder?.unregisterStateListener(this@MainActivity) + serviceBinder?.unregisterLogListener(this@MainActivity) + isBound = false + serviceBinder = null + starProviderService = null + Log.d("MainActivity", "Service disconnected") + } + _currentStatus.value = "Status: Service Unbound" + _isServiceRunningState.value = false + } + } + + private val requestPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean -> + if (isGranted) { Log.i("MainActivity", "Notification permission granted.") } + else { Log.w("MainActivity", "Notification permission denied.") } + } + + override fun onStatusUpdate(status: String, isRunning: Boolean) { CoroutineScope(Dispatchers.Main).launch { _currentStatus.value = status; _isServiceRunningState.value = isRunning } } + override fun onLogMessage(message: String) { CoroutineScope(Dispatchers.Main).launch { _logMessages.value = (_logMessages.value + "\n" + message).takeLast(2000) } } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + sharedPreferences = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE) + + // MODIFIED: Load a set of URLs, provide a default if empty + val savedUrls = sharedPreferences.getStringSet(KEY_SERVER_URLS, null) + if (savedUrls.isNullOrEmpty()) { + _serverUrls.add("ws://localhost:8765") + } else { + _serverUrls.addAll(savedUrls) + } + + _providerName.value = sharedPreferences.getString(KEY_PROVIDER_NAME, "MyAndroidTTS") ?: "MyAndroidTTS" + + setContent { + StarProviderTheme { + StarProviderScreen( + serverUrls = _serverUrls, + onAddServerUrl = { url -> + val trimmedUrl = url.trim() + if (trimmedUrl.isNotBlank() && !_serverUrls.contains(trimmedUrl)) { + _serverUrls.add(trimmedUrl) + saveUrls() + } + }, + onRemoveServerUrl = { url -> _serverUrls.remove(url); saveUrls() }, + providerName = _providerName.value, + onProviderNameChange = { _providerName.value = it; sharedPreferences.edit().putString(KEY_PROVIDER_NAME, it).apply() }, + currentStatus = _currentStatus.value, + logMessages = _logMessages.value, + isServiceRunning = _isServiceRunningState.value, + onStartStopClick = { toggleService() }, + onConfigureVoicesClick = { _showVoiceConfigDialog.value = true }, + onConfigureEnginesClick = { _showEngineConfigDialog.value = true } // NEW + ) + if (_showVoiceConfigDialog.value) { + VoiceConfigurationDialog(onDismiss = { _showVoiceConfigDialog.value = false }, starProviderService = starProviderService) + } + if (_showEngineConfigDialog.value) { + EngineConfigurationDialog(onDismiss = { _showEngineConfigDialog.value = false }, starProviderService = starProviderService) + } + } + } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { requestNotificationPermission() } + } + + private fun saveUrls() { + sharedPreferences.edit().putStringSet(KEY_SERVER_URLS, _serverUrls.toSet()).apply() + } + + override fun onStart() { + super.onStart() + Intent(this, StarProviderService::class.java).also { intent -> + try { + bindService(intent, connection, Context.BIND_AUTO_CREATE) + } catch (e: SecurityException) { + Log.e("MainActivity", "Failed to bind to service", e) + _currentStatus.value = "Error: Cannot bind to service." + } + } + } + + override fun onStop() { + super.onStop() + if (isBound) { + serviceBinder?.unregisterStateListener(this) + serviceBinder?.unregisterLogListener(this) + unbindService(connection) + isBound = false + } + } + + private fun requestNotificationPermission() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + requestPermissionLauncher.launch(android.Manifest.permission.POST_NOTIFICATIONS) + } + } + + private fun startProviderService() { + saveUrls() // Ensure latest URLs are saved before starting + sharedPreferences.edit().putString(KEY_PROVIDER_NAME, _providerName.value).apply() + + // MODIFIED: Pass a list of URLs + val serviceIntent = Intent(this, StarProviderService::class.java).apply { + putStringArrayListExtra(StarProviderService.EXTRA_SERVER_URLS, ArrayList(_serverUrls)) + putExtra("PROVIDER_NAME", _providerName.value) + } + try { + ContextCompat.startForegroundService(this, serviceIntent) + if (!isBound) { + bindService(serviceIntent, connection, Context.BIND_AUTO_CREATE) + } + } catch (e: Exception) { + Log.e("MainActivity", "Error starting service", e) + _currentStatus.value = "Error: Could not start service. ${e.message}" + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && e is SecurityException) { + _currentStatus.value = "Error: FG Service start restricted by OS." + } + } + } + + private fun stopProviderService() { + starProviderService?.stopServiceInternal() ?: run { + val serviceIntent = Intent(this, StarProviderService::class.java) + try { + stopService(serviceIntent) + Log.i("MainActivity", "stopService() called directly.") + } catch (e: Exception) { + Log.e("MainActivity", "Error calling stopService()", e) + } + } + if (!isBound) { + _currentStatus.value = "Status: Disconnected" + _isServiceRunningState.value = false + } + } + + private fun toggleService() { + if (_isServiceRunningState.value) { + stopProviderService() + } else { + startProviderService() + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun StarProviderScreen( + serverUrls: List, onAddServerUrl: (String) -> Unit, onRemoveServerUrl: (String) -> Unit, + providerName: String, onProviderNameChange: (String) -> Unit, + currentStatus: String, logMessages: String, isServiceRunning: Boolean, + onStartStopClick: () -> Unit, onConfigureVoicesClick: () -> Unit, onConfigureEnginesClick: () -> Unit +) { + val logScrollState = rememberScrollState() + val columnScrollState = rememberScrollState() + LaunchedEffect(logMessages) { logScrollState.animateScrollTo(logScrollState.maxValue) } + + Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(16.dp) + .verticalScroll(columnScrollState), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text("STAR Android TTS Provider", style = MaterialTheme.typography.headlineSmall, modifier = Modifier.padding(bottom = 16.dp)) + + Text("Coagulator Hosts", style = MaterialTheme.typography.titleMedium, modifier = Modifier.fillMaxWidth()) + Spacer(Modifier.height(8.dp)) + Column(Modifier.fillMaxWidth().heightIn(max = 150.dp)) { + LazyColumn(modifier = Modifier.background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha=0.2f)).padding(horizontal = 8.dp).fillMaxWidth()) { + items(serverUrls, key = { it }) { url -> + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = 4.dp)) { + Text(url, modifier = Modifier.weight(1f)) + IconButton(onClick = { onRemoveServerUrl(url) }, modifier = Modifier.size(36.dp)) { + Icon(Icons.Default.Delete, contentDescription = "Remove host") + } + } + HorizontalDivider() + } + } + } + var newHostUrl by remember { mutableStateOf("ws://") } + val focusManager = LocalFocusManager.current + OutlinedTextField( + value = newHostUrl, onValueChange = { newHostUrl = it }, + label = { Text("Add new host URL") }, singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Done), + keyboardActions = KeyboardActions(onDone = { onAddServerUrl(newHostUrl); newHostUrl="ws://"; focusManager.clearFocus() }), + modifier = Modifier.fillMaxWidth().padding(top=4.dp), + trailingIcon = { IconButton(onClick = { onAddServerUrl(newHostUrl); newHostUrl="ws://"; focusManager.clearFocus() }) { Icon(Icons.Default.Add, "Add Host") } } + ) + Spacer(modifier = Modifier.height(16.dp)) + + OutlinedTextField(value = providerName, onValueChange = onProviderNameChange, label = { Text("Provider Name") }, singleLine = true, modifier = Modifier.fillMaxWidth()) + Spacer(modifier = Modifier.height(16.dp)) + + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { + Button(onClick = onStartStopClick, modifier = Modifier.weight(1f)) { + Text(if (isServiceRunning) "Stop Provider" else "Start Provider") + } + Spacer(Modifier.width(8.dp)) + IconButton(onClick = onConfigureEnginesClick) { Icon(Icons.Filled.Build, contentDescription = "Configure Engines") } + IconButton(onClick = onConfigureVoicesClick) { Icon(Icons.Filled.Settings, contentDescription = "Configure Voices") } + } + + Spacer(modifier = Modifier.height(16.dp)); Text(currentStatus, style = MaterialTheme.typography.bodyLarge, modifier = Modifier.fillMaxWidth()) + Spacer(modifier = Modifier.height(16.dp)); Text("Logs:", style = MaterialTheme.typography.titleSmall, modifier = Modifier.fillMaxWidth()) + Box(modifier = Modifier.fillMaxWidth().height(200.dp).background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)).padding(8.dp)) { + Text(text = logMessages, modifier = Modifier.fillMaxSize().verticalScroll(logScrollState), style = TextStyle(fontFamily = FontFamily.Monospace, fontSize = 12.sp)) + } + } + } +} + +@Composable +fun EngineConfigurationDialog(onDismiss: () -> Unit, starProviderService: StarProviderService?) { + var engineConfigItems by remember { mutableStateOf>(emptyList()) } + var isLoading by remember { mutableStateOf(true) } + + LaunchedEffect(starProviderService) { + isLoading = true + if (starProviderService != null) { + // This can be called even if the service isn't "running" (connected) yet, as engine discovery happens on create. + engineConfigItems = starProviderService.getSystemEnginesForConfiguration() + } + isLoading = false + } + + Dialog(onDismissRequest = onDismiss) { + Surface(modifier = Modifier.fillMaxWidth(0.95f).fillMaxHeight(0.85f), shape = MaterialTheme.shapes.medium, tonalElevation = AlertDialogDefaults.TonalElevation) { + Column(modifier = Modifier.padding(16.dp)) { + Text("Configure TTS Engines", style = MaterialTheme.typography.headlineSmall, modifier = Modifier.padding(bottom = 16.dp)) + if (isLoading) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { CircularProgressIndicator() } + } else if (engineConfigItems.isEmpty()) { + Text("No TTS engines found or service not ready.", modifier = Modifier.align(Alignment.CenterHorizontally).padding(16.dp)) + } else { + LazyColumn(modifier = Modifier.weight(1f)) { + items(engineConfigItems, key = { it.packageName }) { item -> + Row(modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp), verticalAlignment = Alignment.CenterVertically) { + Column(modifier = Modifier.weight(1f)) { + Text(item.label, style = MaterialTheme.typography.bodyLarge) + Text(item.packageName, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + } + Spacer(modifier = Modifier.width(8.dp)) + Switch( + checked = item.isEnabled, + onCheckedChange = { newEnabled -> + engineConfigItems = engineConfigItems.map { + if (it.packageName == item.packageName) it.copy(isEnabled = newEnabled) else it + } + } + ) + } + HorizontalDivider() + } + } + } + Spacer(modifier = Modifier.height(16.dp)) + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) { + TextButton(onClick = onDismiss) { Text("Cancel") } + Spacer(modifier = Modifier.width(8.dp)) + Button(onClick = { + val configsToSave = engineConfigItems.associate { it.packageName to it.isEnabled } + starProviderService?.saveAndReloadEngineConfigs(configsToSave) + onDismiss() + }, enabled = !isLoading && engineConfigItems.isNotEmpty()) { + Text("Save & Apply") + } + } + } + } + } +} + + +data class VoiceConfigItem( + val id: String, // Composite ID format: "engineName:originalName" + val displayName: String, + var alias: String, + var isEnabled: Boolean, + val locale: String, + val isNetwork: Boolean +) + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun VoiceConfigurationDialog( + onDismiss: () -> Unit, + starProviderService: StarProviderService? +) { + // *** START OF FIX *** + // REMOVED the `if (starProviderService?.isRunning() != true)` check. + // The dialog should open if the service is bound, not necessarily "running". + // The isLoading state handles the rest. + + var voiceConfigItems by remember { mutableStateOf>(emptyList()) } + var isLoading by remember { mutableStateOf(true) } + + // Simplified the LaunchedEffect key. It only needs to know about the service instance. + LaunchedEffect(starProviderService) { + isLoading = true + if (starProviderService != null) { + val systemVoicesData = starProviderService.getSystemVoicesForConfiguration() + voiceConfigItems = systemVoicesData.map { dialogInfo -> + val engineShortName = dialogInfo.engineName.split('.').lastOrNull() ?: dialogInfo.engineName + VoiceConfigItem( + id = "${dialogInfo.engineName}:${dialogInfo.originalName}", + displayName = "${dialogInfo.originalName} (${dialogInfo.locale.toLanguageTag()}, Engine: $engineShortName)", + alias = dialogInfo.currentAlias, + isEnabled = dialogInfo.currentIsEnabled, + locale = dialogInfo.locale.toLanguageTag(), + isNetwork = dialogInfo.isNetwork + ) + } + } + isLoading = false + } + + Dialog(onDismissRequest = onDismiss) { + Surface(modifier = Modifier.fillMaxWidth(0.95f).fillMaxHeight(0.85f), shape = MaterialTheme.shapes.medium, tonalElevation = AlertDialogDefaults.TonalElevation) { + Column(modifier = Modifier.padding(16.dp)) { + Text("Configure Voices", style = MaterialTheme.typography.headlineSmall, modifier = Modifier.padding(bottom = 16.dp)) + if (isLoading) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { CircularProgressIndicator() } + } else if (voiceConfigItems.isEmpty()) { + Text("No voices available. Check TTS engine configuration or logs.", modifier = Modifier.align(Alignment.CenterHorizontally).padding(16.dp)) + } else { + LazyColumn(modifier = Modifier.weight(1f)) { + items(voiceConfigItems, key = { it.id }) { item -> + VoiceConfigRow( + item = item, + onAliasChange = { newAlias -> voiceConfigItems = voiceConfigItems.map { if (it.id == item.id) it.copy(alias = newAlias) else it } }, + onEnabledChange = { newEnabled -> voiceConfigItems = voiceConfigItems.map { if (it.id == item.id) it.copy(isEnabled = newEnabled) else it } } + ) + HorizontalDivider() + } + } + } + Spacer(modifier = Modifier.height(16.dp)) + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) { + TextButton(onClick = onDismiss) { Text("Cancel") } + Spacer(modifier = Modifier.width(8.dp)) + Button( + onClick = { + val configsToSave = voiceConfigItems.mapNotNull { item -> + val idParts = item.id.split(":", limit = 2) + if (idParts.size == 2) { + PersistedVoiceConfig(originalName = idParts[1], engineName = idParts[0], starLabel = item.alias, isEnabled = item.isEnabled) + } else { + Log.w("MainActivity", "Skipping invalid voice config item with ID: ${item.id}") + null + } + } + starProviderService?.savePersistedVoiceConfigs(configsToSave) + onDismiss() + }, + enabled = !isLoading && voiceConfigItems.isNotEmpty() + ) { Text("Save & Apply") } + } + } + } + } + // *** END OF FIX *** +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun VoiceConfigRow(item: VoiceConfigItem, onAliasChange: (String) -> Unit, onEnabledChange: (Boolean) -> Unit) { + Row(modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp), verticalAlignment = Alignment.CenterVertically) { + Column(modifier = Modifier.weight(1f)) { + Text(item.displayName, style = MaterialTheme.typography.bodyLarge) + OutlinedTextField( + value = item.alias, + onValueChange = onAliasChange, + label = { Text("STAR Label (Alias)") }, + singleLine = true, + modifier = Modifier.fillMaxWidth().padding(top = 4.dp) + ) + } + Spacer(modifier = Modifier.width(8.dp)) + Switch(checked = item.isEnabled, onCheckedChange = onEnabledChange) + } +} \ No newline at end of file diff --git a/provider/android/app/src/main/java/com/star/provider/starProviderService.kt b/provider/android/app/src/main/java/com/star/provider/starProviderService.kt new file mode 100644 index 0000000..77ea994 --- /dev/null +++ b/provider/android/app/src/main/java/com/star/provider/starProviderService.kt @@ -0,0 +1,779 @@ +package com.star.provider + +import android.app.Notification +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent +import android.app.Service +import android.content.Context +import android.content.Intent +import android.content.SharedPreferences +import android.os.Binder +import android.os.Build +import android.os.Bundle +import android.os.Handler +import android.os.IBinder +import android.os.Looper +import android.speech.tts.TextToSpeech +import android.speech.tts.UtteranceProgressListener +import android.speech.tts.Voice +import android.util.Log +import androidx.core.app.NotificationCompat +import okhttp3.* +import okhttp3.Credentials +import okhttp3.HttpUrl.Companion.toHttpUrlOrNull +import okio.ByteString +import okio.ByteString.Companion.toByteString +import org.json.JSONArray +import org.json.JSONException +import org.json.JSONObject +import java.io.File +import java.io.FileOutputStream +import java.io.IOException +import java.nio.ByteBuffer +import java.nio.ByteOrder +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale +import java.util.UUID +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.CopyOnWriteArrayList +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicInteger +import kotlin.math.pow +import com.star.provider.R + + +// --- Listener Interfaces --- +interface ServiceStateListener { + fun onStatusUpdate(status: String, isRunning: Boolean) +} + +interface ServiceLogListener { + fun onLogMessage(message: String) +} + +// --- Data Classes --- +private data class CoagulatorConnection( + val hostUrl: String, + var webSocket: WebSocket? = null, + var status: String = "Idle", + var reconnectAttempts: Int = 0, + var isManuallyStopped: Boolean = false, + val handler: Handler = Handler(Looper.getMainLooper()), + val client: OkHttpClient +) + +data class PersistedVoiceConfig( + val originalName: String, + val engineName: String, + var starLabel: String, + var isEnabled: Boolean +) + +data class StarVoiceConfig( + val originalName: String, + val engineName: String, + val androidVoice: Voice, + var starLabel: String, + var isEnabled: Boolean = true, + val systemLocaleTag: String = androidVoice.locale.toLanguageTag(), + val systemIsNetwork: Boolean = androidVoice.isNetworkConnectionRequired +) + +data class DialogVoiceInfo( + val originalName: String, + val engineName: String, + val locale: Locale, + val isNetwork: Boolean, + val currentAlias: String, + val currentIsEnabled: Boolean +) + +data class DialogEngineInfo( + val packageName: String, + val label: String, + val isEnabled: Boolean +) + +class StarProviderService : Service() { + + private val binder = LocalBinder() + private val ttsEngines = mutableMapOf() + private val ttsInitializedEngines = mutableSetOf() + private var ttsDiscoveryInstance: TextToSpeech? = null + private var allEnginesDiscovered = false + private val engineLabels = mutableMapOf() + private var allSystemVoices: MutableList = mutableListOf() + private var activeStarVoices: Map = mapOf() + private val connections = ConcurrentHashMap() + private val synthesisQueue = ConcurrentHashMap() + private val utteranceContexts = ConcurrentHashMap() + private val NOTIFICATION_ID = 101 + private val CHANNEL_ID = "StarProviderServiceChannel" + private var providerNameInternal: String = "AndroidProvider" + private val providerRevision = 4 + private var currentStatus: String = "Service Idle" + private var isServiceCurrentlyRunning = false + private val canceledRequests = ConcurrentHashMap.newKeySet() + private var isManuallyStopped = false + private val stateListeners = CopyOnWriteArrayList() + private val logListeners = CopyOnWriteArrayList() + private lateinit var sharedPreferences: SharedPreferences + private val VOICE_CONFIG_PREF_KEY = "voice_configurations" + private val ENGINE_CONFIG_PREF_KEY = "engine_configurations" + private val LOG_FILE_NAME = "star_provider_service.log" + private val BACKUP_LOG_FILE_NAME = "star_provider_service.log.1" + private val MAX_LOG_SIZE_BYTES = 1 * 1024 * 1024 + private var logFile: File? = null + + private data class SynthesisRequest( + val starRequestId: String, + val text: String, + val voiceStarLabel: String, + val rate: Float, + val pitch: Float + ) + + inner class LocalBinder : Binder() { + fun getService(): StarProviderService = this@StarProviderService + fun registerStateListener(listener: ServiceStateListener) { + stateListeners.add(listener) + listener.onStatusUpdate(currentStatus, isServiceCurrentlyRunning) + } + fun unregisterStateListener(listener: ServiceStateListener) { stateListeners.remove(listener) } + fun registerLogListener(listener: ServiceLogListener) { logListeners.add(listener) } + fun unregisterLogListener(listener: ServiceLogListener) { logListeners.remove(listener) } + } + + override fun onBind(intent: Intent): IBinder = binder + + override fun onCreate() { + super.onCreate() + Log.d("StarProviderService", "onCreate") + sharedPreferences = getSharedPreferences("StarProviderPrefs", Context.MODE_PRIVATE) + initializeLogFile() + logToFile("Service onCreate") + ttsDiscoveryInstance = TextToSpeech(this) { status -> + if (status == TextToSpeech.SUCCESS) { + discoverAllSystemEnginesAndInitialize() + } else { + val errorMsg = "TTS Discovery Engine failed to initialize. Status: $status" + logToFile("CRITICAL: $errorMsg") + updateStatus(errorMsg, false); stopSelf() + } + } + createNotificationChannel() + } + + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { + Log.d("StarProviderService", "onStartCommand received") + isManuallyStopped = false + val hostUrls = intent?.getStringArrayListExtra(EXTRA_SERVER_URLS) + providerNameInternal = intent?.getStringExtra("PROVIDER_NAME") ?: "MyAndroidTTS" + + if (hostUrls.isNullOrEmpty()) { + val errorMsg = "Error: Server URLs are missing." + logToFile(errorMsg); updateStatus(errorMsg, false); stopSelf() + return START_NOT_STICKY + } + logToFile("Service starting with ${hostUrls.size} hosts: ${hostUrls.joinToString()}") + startForegroundService() + isServiceCurrentlyRunning = true + updateStatus("Service Starting, Initializing...", true) + + connections.clear() + hostUrls.forEach { url -> + val parseableUrl = url.replaceFirst("ws://", "http://", true).replaceFirst("wss://", "https://", true) + val httpUrl = parseableUrl.toHttpUrlOrNull() + if (httpUrl == null) { + logToActivity("Invalid host URL format: $url. Skipping.") + logToFile("ERROR: Invalid host URL format '$url'. Could not parse.") + return@forEach + } + val user = httpUrl.username + val pass = httpUrl.password + val clientBuilder = OkHttpClient.Builder().readTimeout(0, TimeUnit.MILLISECONDS).pingInterval(30, TimeUnit.SECONDS) + if (user.isNotBlank()) { + val credential = Credentials.basic(user, pass) + clientBuilder.authenticator { _, response -> response.request.newBuilder().header("Authorization", credential).build() } + } + connections[url] = CoagulatorConnection(hostUrl = url, client = clientBuilder.build()) + logToFile("Configured connection for: $url") + } + + if (connections.isEmpty()) { + val errorMsg = "No valid host URLs provided." + logToFile(errorMsg); updateStatus(errorMsg, false); stopSelf() + return START_NOT_STICKY + } + + if (isTtsReady()) { + connections.keys.forEach { connectWebSocket(it) } + } else { + logToFile("TTS not ready, connections will be attempted after initialization.") + } + return START_STICKY + } + + private fun startForegroundService() { + val notificationIntent = Intent(this, MainActivity::class.java) + val pendingIntentFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT else PendingIntent.FLAG_UPDATE_CURRENT + val pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, pendingIntentFlags) + val notification = NotificationCompat.Builder(this, CHANNEL_ID) + .setContentTitle("STAR Provider Active").setContentText("Initializing...") + .setSmallIcon(R.drawable.ic_stat_name).setContentIntent(pendingIntent) + .setOngoing(true).build() + startForeground(NOTIFICATION_ID, notification) + } + + private fun discoverAllSystemEnginesAndInitialize() { + logToFile("Starting initial discovery of all system TTS engines...") + val allSystemEngineInfos = ttsDiscoveryInstance?.engines ?: run { + updateStatus("Error: Could not query TTS engines.", false); stopSelf(); return + } + if (allSystemEngineInfos.isEmpty()) { + updateStatus("No TTS engines found on this device.", false); stopSelf(); return + } + engineLabels.clear() + allSystemEngineInfos.forEach { engineInfo -> engineLabels[engineInfo.name] = engineInfo.label } + allEnginesDiscovered = true + logToFile("Discovered ${engineLabels.size} total engines: ${engineLabels.values.joinToString()}") + initializeEnabledEngines() + } + + private fun initializeEnabledEngines(onComplete: (() -> Unit)? = null) { + logToFile("Initializing enabled engines...") + val enabledEngineConfigs = loadEngineConfigurations() + val enginesToInitialize = engineLabels.filter { (packageName, _) -> enabledEngineConfigs.getOrDefault(packageName, true) } + logToFile("Engines to be initialized: ${enginesToInitialize.values.joinToString()}") + + if (enginesToInitialize.isEmpty()) { + logToActivity("No engines are enabled.") + populateAvailableVoices() + onComplete?.invoke() + return + } + + val initializationCounter = AtomicInteger(enginesToInitialize.size) + enginesToInitialize.forEach { (enginePackageName, engineLabel) -> + try { + val ttsInstance = TextToSpeech(this, { status -> + if (status == TextToSpeech.SUCCESS) { + ttsInitializedEngines.add(enginePackageName) + ttsEngines[enginePackageName]?.setOnUtteranceProgressListener(StarUtteranceListener()) + logToFile("TTS Engine initialized successfully: $engineLabel") + } else { + logToFile("TTS Engine failed to initialize: $engineLabel, Status: $status") + } + if (initializationCounter.decrementAndGet() == 0) { + logToFile("All requested engines have finished initialization process.") + populateAvailableVoices() + onComplete?.invoke() + } + }, enginePackageName) + ttsEngines[enginePackageName] = ttsInstance + } catch (e: Exception) { + logToFile("Failed to instantiate TTS engine $engineLabel: ${e.message}") + if (initializationCounter.decrementAndGet() == 0) { + logToFile("All requested engines have finished initialization process (with errors).") + populateAvailableVoices() + onComplete?.invoke() + } + } + } + } + + // --- Voice & Engine Configuration --- + fun saveAndReloadEngineConfigs(newConfigs: Map) { + // 1. Save the new configuration. This is now the single source of truth. + sharedPreferences.edit().putString(ENGINE_CONFIG_PREF_KEY, JSONObject(newConfigs as Map<*, *>).toString()).apply() + logToFile("Saved updated engine configurations. Performing full state refresh.") + logToActivity("Applying new engine configuration...") + + // 2. Define the action to take AFTER the new state is fully initialized. + val onRefreshComplete = { + logToActivity("Engine refresh complete. Repopulating voice list from active engines.") + populateAvailableVoices() // This will now use the new, correct list of running engines. + + // --- START OF FIX --- + // The original code re-registered on the existing connection, which the Python + // coagulator does not handle as a "refresh". We must force a disconnect/reconnect. + logToActivity("Forcing reconnection to servers to apply new engine configuration.") + val hostsToReconnect = connections.keys.toList() // Iterate over a copy + hostsToReconnect.forEach { hostUrl -> + connections[hostUrl]?.let { conn -> + conn.webSocket?.close(1000, "Re-registering new engine configuration") + conn.webSocket = null + conn.handler.removeCallbacksAndMessages(null) + conn.reconnectAttempts = 0 + logToFile("Force-reconnecting to $hostUrl to apply engine changes.") + connectWebSocket(hostUrl) + } + } + // --- END OF FIX --- + } + + // 3. SHUT DOWN ALL currently running TTS engines. This is the crucial "tear down" step. + // It ensures we start from a completely clean slate, preventing any state corruption. + logToFile("Shutting down all current TTS engines before re-initialization.") + // We iterate over a copy of the values to avoid concurrent modification issues. + ttsEngines.values.toList().forEach { engine -> + try { + // IMPORTANT: We do NOT clear engineLabels. This is the master list + // for the configuration dialog and must be preserved. + engine.shutdown() + } catch (e: Exception) { + logToFile("Error during engine shutdown: ${e.message}") + } + } + // Clear the maps/sets that track the RUNNING state. + ttsEngines.clear() + ttsInitializedEngines.clear() + logToFile("All running engines shut down and active state cleared.") + + // 4. Re-initialize from scratch using the new configuration we just saved. + // The `initializeEnabledEngines` function is perfect for this. We pass our + // final action as the completion handler. + logToFile("Starting re-initialization of enabled engines...") + initializeEnabledEngines(onComplete = onRefreshComplete) + } + + fun getSystemEnginesForConfiguration(): List { + if (!allEnginesDiscovered) return emptyList() + val persistedConfigs = loadEngineConfigurations() + return engineLabels.map { (packageName, label) -> + DialogEngineInfo(packageName, label, persistedConfigs.getOrDefault(packageName, true)) + }.sortedBy { it.label } + } + + private fun loadEngineConfigurations(): Map { + val jsonString = sharedPreferences.getString(ENGINE_CONFIG_PREF_KEY, null) + return if (jsonString != null) { + try { + val json = JSONObject(jsonString) + json.keys().asSequence().associateWith { key -> json.getBoolean(key) } + } catch (e: Exception) { + Log.e("StarProviderService", "Error parsing engine configurations", e); emptyMap() + } + } else { emptyMap() } + } + + fun getSystemVoicesForConfiguration(): List { + if (!isTtsReady() && ttsInitializedEngines.isEmpty()) return emptyList() + val persistedConfigs = loadVoiceConfigurations().associateBy { "${it.engineName}:${it.originalName}" } + return ttsInitializedEngines.flatMap { engineName -> + val tts = ttsEngines[engineName] ?: return@flatMap emptyList() + try { + tts.voices?.mapNotNull { voice -> + val configKey = "$engineName:${voice.name}" + val persisted = persistedConfigs[configKey] + val defaultAlias = "${engineName.split(".").lastOrNull() ?: "eng"}_${voice.name}".replace(Regex("[^a-zA-Z0-9_\\-]"), "_") + DialogVoiceInfo(voice.name, engineName, voice.locale, voice.isNetworkConnectionRequired, + persisted?.starLabel ?: defaultAlias, persisted?.isEnabled ?: true) + } ?: emptyList() + } catch (e: Exception) { + Log.e("StarProviderService", "Error getting voices for engine $engineName: ${e.message}", e); emptyList() + } + } + } + + fun savePersistedVoiceConfigs(configs: List) { + sharedPreferences.edit().putString(VOICE_CONFIG_PREF_KEY, convertPersistedVoiceConfigListToJson(configs)).apply() + logToFile("Saved updated voice configurations from MainActivity.") + logToActivity("Applying new voice settings...") + + // First, update the service's internal list of what voices *should* be active. + populateAvailableVoices() + + // --- START OF FIX --- + // The original code re-registered on the existing connection. However, the Python + // coagulator does not clear the old voice list on re-registration; it only + // clears voices when a provider disconnects. + // The correct logic, to mimic the Python provider being restarted, is to + // force a disconnect and reconnect. This makes the coagulator drop the old + // voice list and receive a fresh one on the new connection. + + logToActivity("Forcing reconnection to servers to apply new voice list.") + val hostsToReconnect = connections.keys.toList() // Avoid ConcurrentModificationException by iterating over a copy. + hostsToReconnect.forEach { hostUrl -> + connections[hostUrl]?.let { conn -> + // Close the existing socket cleanly. + conn.webSocket?.close(1000, "Re-registering new voice configuration") + conn.webSocket = null // Ensure the connection is seen as closed immediately. + + // Clear any pending automatic reconnect tasks to avoid conflicts. + conn.handler.removeCallbacksAndMessages(null) + + // Reset the reconnect backoff counter for a clean slate. + conn.reconnectAttempts = 0 + + // Initiate a new connection attempt immediately. + logToFile("Force-reconnecting to $hostUrl to apply voice changes.") + connectWebSocket(hostUrl) + } + } + // --- END OF FIX --- + } + + private fun loadVoiceConfigurations(): List { + val jsonString = sharedPreferences.getString(VOICE_CONFIG_PREF_KEY, null) + return if (jsonString != null) { + try { parsePersistedVoiceConfigListFromJson(jsonString) + } catch (e: Exception) { Log.e("StarProviderService", "Error parsing voice configurations from JSON", e); emptyList() } + } else { emptyList() } + } + + private fun convertPersistedVoiceConfigListToJson(configs: List): String { + val jsonArray = JSONArray() + configs.forEach { config -> + val jsonObj = JSONObject() + jsonObj.put("originalName", config.originalName); jsonObj.put("engineName", config.engineName) + jsonObj.put("starLabel", config.starLabel); jsonObj.put("isEnabled", config.isEnabled) + jsonArray.put(jsonObj) + } + return jsonArray.toString() + } + + private fun parsePersistedVoiceConfigListFromJson(jsonString: String): List { + val configs = mutableListOf() + try { + val jsonArray = JSONArray(jsonString) + for (i in 0 until jsonArray.length()) { + val jsonObj = jsonArray.getJSONObject(i) + configs.add(PersistedVoiceConfig( + originalName = jsonObj.getString("originalName"), engineName = jsonObj.getString("engineName"), + starLabel = jsonObj.getString("starLabel"), isEnabled = jsonObj.getBoolean("isEnabled") + )) + } + } catch (e: JSONException) { Log.e("StarProviderService", "Manual JSON parsing error for voice configs: ${e.message}", e) } + return configs + } + + private fun populateAvailableVoices() { + allSystemVoices.clear() + val persistedVoiceConfigs = loadVoiceConfigurations().associateBy { "${it.engineName}:${it.originalName}" } + var voiceDetailsLog = "Populating available voices based on active engines...\n" + val activeEngines = ttsInitializedEngines.toList() + voiceDetailsLog += "Active initialized engines: ${activeEngines.joinToString { engineLabels[it] ?: it }}\n" + activeEngines.forEach { engineName -> + val tts = ttsEngines[engineName] ?: return@forEach + val engineLabel = engineLabels[engineName] ?: "Unknown" + try { + tts.voices?.forEach { voice -> + val configKey = "$engineName:${voice.name}" + val persistedConfig = persistedVoiceConfigs[configKey] + val defaultStarLabel = "${engineName.split(".").lastOrNull() ?: "eng"}_${voice.name}".replace(Regex("[^a-zA-Z0-9_\\-]"), "_") + val starLabel = persistedConfig?.starLabel ?: defaultStarLabel + val isEnabled = persistedConfig?.isEnabled ?: true + val voiceConfig = StarVoiceConfig(originalName = voice.name, engineName = engineName, androidVoice = voice, starLabel = starLabel, isEnabled = isEnabled) + allSystemVoices.add(voiceConfig) + voiceDetailsLog += " Found voice: ${voice.name} (Engine: $engineLabel), STAR Label: ${voiceConfig.starLabel}, Enabled: ${voiceConfig.isEnabled}\n" + } + } catch (e: Exception) { + voiceDetailsLog += " Error populating voices for $engineName: ${e.message}\n" + } + } + val finalActiveVoices = mutableMapOf() + val usedLabels = mutableSetOf() + allSystemVoices.filter { it.isEnabled }.forEach { config -> + var currentLabel = config.starLabel; var counter = 1 + while(usedLabels.contains(currentLabel)) { currentLabel = "${config.starLabel}_${counter++}" } + usedLabels.add(currentLabel) + finalActiveVoices[currentLabel] = config.copy(starLabel = currentLabel) + } + activeStarVoices = finalActiveVoices + logToFile(voiceDetailsLog.trim()) + if (activeStarVoices.isEmpty()) { + logToActivity("Warning: No active TTS voices found or configured.") + } + updateCombinedStatus() + } + + private fun connectWebSocket(hostUrl: String) { + val connection = connections[hostUrl] + if (connection == null) { logToFile("Error: Attempted to connect to an unconfigured host: $hostUrl"); return } + if (connection.webSocket != null) { logToActivity("WebSocket for $hostUrl already connected or connecting."); return } + val connectMsg = "Attempting to connect to: $hostUrl (Attempt: ${connection.reconnectAttempts + 1})" + logToFile(connectMsg) + val request = Request.Builder().url(hostUrl).build() + connection.client.newWebSocket(request, StarWebSocketListener(hostUrl)) + connection.status = "Connecting... (Attempt ${connection.reconnectAttempts + 1})" + updateCombinedStatus() + } + + private fun scheduleReconnect(hostUrl: String) { + val connection = connections[hostUrl] ?: return + val maxReconnectAttempts = 10 + val initialReconnectDelayMs = 1000L + if (connection.isManuallyStopped || connection.reconnectAttempts >= maxReconnectAttempts) { + logToFile("Max reconnects for $hostUrl or manually stopped. Giving up.") + connection.status = "Disconnected (Max retries)"; updateCombinedStatus(); return + } + val delay = (initialReconnectDelayMs * 2.0.pow(connection.reconnectAttempts.toDouble())).toLong() + connection.reconnectAttempts++ + logToFile("Scheduling reconnect for $hostUrl in ${delay}ms.") + logToActivity("Connection to $hostUrl lost. Reconnecting in ${delay/1000}s...") + connection.status = "Reconnecting (Attempt ${connection.reconnectAttempts})..." + updateCombinedStatus() + connection.handler.postDelayed({ + if (!connection.isManuallyStopped) { + logToFile("Executing reconnect for $hostUrl.") + connectWebSocket(hostUrl) + } else { + logToFile("Reconnect for $hostUrl cancelled.") + } + }, delay) + } + + private fun registerWithCoagulator(webSocket: WebSocket) { + if (!isTtsReady() && activeStarVoices.isEmpty()) { + logToActivity("TTS not fully ready, but sending available voices (${activeStarVoices.size})") + } + val registrationPayload = JSONObject().apply { + put("provider", providerRevision) + put("provider_name", providerNameInternal) + put("voices", JSONArray(activeStarVoices.keys.toList())) + }.toString() + logToFile("TX Registration to ${webSocket.request().url}: $registrationPayload") + val sent = webSocket.send(registrationPayload) + if (sent) { logToActivity("Registration sent to ${webSocket.request().url.host}.") } + else { logToActivity("Failed to send registration to ${webSocket.request().url.host}.") } + } + + private inner class StarWebSocketListener(private val hostUrl: String) : WebSocketListener() { + override fun onOpen(webSocket: WebSocket, response: Response) { + val connection = connections[hostUrl] ?: return + connection.webSocket = webSocket; connection.reconnectAttempts = 0; connection.status = "Connected" + val msg = "WebSocket Connected to $hostUrl" + Log.i("StarProviderService", msg); logToActivity(msg); updateCombinedStatus(); registerWithCoagulator(webSocket) + } + override fun onMessage(webSocket: WebSocket, text: String) { + Log.d("StarProviderService", "RX Text from ${webSocket.request().url.host}: $text"); logToActivity("RX: $text") + try { + val json = JSONObject(text) + if (json.has("abort")) { + val requestIdToCancel = json.optString("abort"); if (requestIdToCancel.isNotEmpty()) { + canceledRequests.add(requestIdToCancel); logToActivity("Abort request for ID: $requestIdToCancel.") + }; return + } + if (!json.has("voice") || !json.has("text") || !json.has("id")) { + logToActivity("Invalid request (missing fields): $text"); return + } + handleSynthesisRequest(json.getString("voice"), json.getString("text"), json.getString("id"), + json.optDouble("rate", 1.0).toFloat(), json.optDouble("pitch", 1.0).toFloat(), webSocket) + } catch (e: JSONException) { logToActivity("Error parsing JSON from server: ${e.message}") } + } + override fun onClosing(webSocket: WebSocket, code: Int, reason: String) { + val msg = "WebSocket Closing for $hostUrl: $code / $reason" + Log.i("StarProviderService", msg); logToActivity(msg); cleanupWebSocket(hostUrl) + if (code != 1000 && !(connections[hostUrl]?.isManuallyStopped ?: false)) { scheduleReconnect(hostUrl) + } else { connections[hostUrl]?.status = "Disconnected"; updateCombinedStatus() } + } + override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) { + val msg = "WebSocket Failure for $hostUrl: ${t.message}" + Log.e("StarProviderService", msg, t); logToActivity(msg); cleanupWebSocket(hostUrl) + if (!(connections[hostUrl]?.isManuallyStopped ?: false)) { scheduleReconnect(hostUrl) + } else { connections[hostUrl]?.status = "Disconnected (Failure)"; updateCombinedStatus() } + } + override fun onMessage(webSocket: WebSocket, bytes: ByteString) { val msg = "RX Binary from ${webSocket.request().url.host}: ${bytes.hex()}"; Log.d("StarProviderService", msg); logToActivity(msg) } + } + + private fun cleanupWebSocket(hostUrl: String) { + logToFile("Cleaning up WebSocket for $hostUrl.") + val connection = connections[hostUrl]; connection?.webSocket?.close(1000, "Client closing"); connection?.webSocket = null; updateCombinedStatus() + } + + private fun handleSynthesisRequest(voiceStarLabel: String, textToSpeak: String, starRequestId: String, rate: Float, pitch: Float, sourceSocket: WebSocket) { + logToFile("Handling synthesis ID: $starRequestId from ${sourceSocket.request().url.host}, Voice: $voiceStarLabel, Text: \"${textToSpeak.take(50)}...\"") + if (canceledRequests.contains(starRequestId)) { + canceledRequests.remove(starRequestId); logToActivity("Synthesis for ID $starRequestId canceled by client before starting.") + sendError(starRequestId, "Request canceled by client.", sourceSocket); return + } + if (!isTtsReady()) { sendError(starRequestId, "TTS not ready on Android provider for request $starRequestId.", sourceSocket); return } + val voiceConfig = activeStarVoices[voiceStarLabel] + if (voiceConfig == null) { + val errorMsg = "Voice '$voiceStarLabel' not found or not active. Active: ${activeStarVoices.keys.joinToString()}" + sendError(starRequestId, errorMsg, sourceSocket); logToActivity(errorMsg); return + } + val tts = ttsEngines[voiceConfig.engineName] + if (tts == null) { + val errorMsg = "TTS engine '${voiceConfig.engineName}' for voice '$voiceStarLabel' is not available or failed to initialize." + sendError(starRequestId, errorMsg, sourceSocket); logToActivity(errorMsg); return + } + val utteranceId = UUID.randomUUID().toString() + synthesisQueue[utteranceId] = SynthesisRequest(starRequestId, textToSpeak, voiceStarLabel, rate, pitch) + utteranceContexts[utteranceId] = sourceSocket + tts.voice = voiceConfig.androidVoice; tts.setSpeechRate(rate.coerceIn(0.1f, 4.0f)); tts.setPitch(pitch.coerceIn(0.1f, 4.0f)) + val tempAudioFile = File(cacheDir, "$utteranceId.wav") + logToActivity("Synthesizing for $starRequestId (utt: $utteranceId) using Engine: ${engineLabels[voiceConfig.engineName] ?: "Unknown"}, Voice: ${voiceConfig.androidVoice.name}") + val result = tts.synthesizeToFile(textToSpeak, Bundle(), tempAudioFile, utteranceId) + if (result != TextToSpeech.SUCCESS) { + val errorMsg = "TTS synthesizeToFile failed for $utteranceId (STAR ID: $starRequestId). Code: $result" + Log.e("StarProviderService", errorMsg); logToFile(errorMsg) + synthesisQueue.remove(utteranceId); utteranceContexts.remove(utteranceId) + sendError(starRequestId, "Android TTS synthesis command failed (code: $result).", sourceSocket) + tempAudioFile.delete() + } + } + + private inner class StarUtteranceListener : UtteranceProgressListener() { + override fun onStart(utteranceId: String?) { + Log.d("TTSListener", "Utterance started: $utteranceId") + synthesisQueue[utteranceId]?.let { logToActivity("TTS synthesis started for STAR ID: ${it.starRequestId} (Utt: $utteranceId)") } + } + override fun onDone(utteranceId: String?) { + Log.d("TTSListener", "Utterance done: $utteranceId") + val requestDetails = synthesisQueue.remove(utteranceId) + val sourceSocket = utteranceContexts.remove(utteranceId) + if (utteranceId != null && requestDetails != null && sourceSocket != null) { + if (canceledRequests.contains(requestDetails.starRequestId)) { + canceledRequests.remove(requestDetails.starRequestId) + logToActivity("Synthesis for ID ${requestDetails.starRequestId} completed but was canceled. Audio not sent.") + File(cacheDir, "$utteranceId.wav").delete(); return + } + val audioFile = File(cacheDir, "$utteranceId.wav") + if (audioFile.exists() && audioFile.length() > 0) { + logToActivity("TTS synthesis done for ${requestDetails.starRequestId}, sending audio (${audioFile.length()} bytes).") + sendAudioData(requestDetails.starRequestId, audioFile, sourceSocket) + } else { + sendError(requestDetails.starRequestId, "Synthesized audio file not found or was empty.", sourceSocket) + } + audioFile.delete() + } + } + override fun onError(utteranceId: String?, errorCode: Int) { + val errorDetail = ttsErrorToString(errorCode) + Log.e("TTSListener", "TTSListener: onError for $utteranceId, code: $errorCode ($errorDetail)") + handleTtsError(utteranceId, errorDetail) + } + private fun handleTtsError(utteranceId: String?, errorMessage: String) { + val requestDetails = synthesisQueue.remove(utteranceId) + val sourceSocket = utteranceContexts.remove(utteranceId) + if (utteranceId != null && requestDetails != null && sourceSocket != null) { + if (!canceledRequests.remove(requestDetails.starRequestId)) { + val detailedError = "Android TTS Error for ${requestDetails.starRequestId}: $errorMessage" + sendError(requestDetails.starRequestId, detailedError, sourceSocket) + } + } + File(cacheDir, "$utteranceId.wav").delete() + } + @Deprecated("deprecated", replaceWith = ReplaceWith("onError(utteranceId, errorCode)")) + override fun onError(utteranceId: String?) { onError(utteranceId, -1) } + private fun ttsErrorToString(errorCode: Int): String = when (errorCode) { + TextToSpeech.ERROR_SYNTHESIS -> "Synthesis error"; TextToSpeech.ERROR_SERVICE -> "Service error (TTS engine)" + TextToSpeech.ERROR_OUTPUT -> "Output error"; TextToSpeech.ERROR_NETWORK -> "Network error" + TextToSpeech.ERROR_NETWORK_TIMEOUT -> "Network timeout"; TextToSpeech.ERROR_INVALID_REQUEST -> "Invalid request" + TextToSpeech.ERROR_NOT_INSTALLED_YET -> "TTS data not installed yet"; else -> "Unknown TTS error ($errorCode)" + } + } + + private fun sendAudioData(starRequestId: String, audioFile: File, destinationSocket: WebSocket) { + val audioBytes = audioFile.readBytes() + val metadataJsonString = JSONObject().apply { put("id", starRequestId); put("extension", "wav") }.toString() + val metadataBytes = metadataJsonString.toByteArray(Charsets.UTF_8) + val metadataLength = metadataBytes.size.toShort() + val packetBuffer = ByteBuffer.allocate(2 + metadataBytes.size + audioBytes.size) + packetBuffer.order(ByteOrder.LITTLE_ENDIAN); packetBuffer.putShort(metadataLength); packetBuffer.put(metadataBytes); packetBuffer.put(audioBytes) + val combinedPacket = packetBuffer.array().toByteString(0, packetBuffer.position()) + val sent = destinationSocket.send(combinedPacket) + if (sent) logToActivity("Sent audio for $starRequestId to ${destinationSocket.request().url.host}") + else logToActivity("Failed to send audio packet for $starRequestId to ${destinationSocket.request().url.host}") + } + + private fun sendError(starRequestId: String, errorMessage: String, destinationSocket: WebSocket) { + val errorPayload = JSONObject().apply { + put("provider", providerRevision); put("id", starRequestId) + put("status", errorMessage.take(200)); put("abort", true) + }.toString() + logToFile("TX Error for $starRequestId to ${destinationSocket.request().url.host}: $errorMessage") + destinationSocket.send(errorPayload) + } + + private fun updateCombinedStatus() { + val connectedCount = connections.values.count { it.webSocket != null && it.status == "Connected" } + val totalCount = connections.size + val isAnyConnecting = connections.values.any { it.status.contains("Connecting") || it.status.contains("Reconnecting") } + val summary = if (totalCount > 0) "Connected to $connectedCount of $totalCount hosts. Voices: ${activeStarVoices.size}" + else "No hosts configured. Voices: ${activeStarVoices.size}" + val isRunning = connectedCount > 0 || isAnyConnecting + updateStatus(summary, isRunning) + } + + private fun updateStatus(newStatus: String, isRunning: Boolean) { + currentStatus = newStatus; isServiceCurrentlyRunning = isRunning + Log.i("StarProviderService", "Status Update: $newStatus, IsRunning: $isRunning") + updateNotification(newStatus); stateListeners.forEach { it.onStatusUpdate(newStatus, isRunning) } + } + + internal fun stopServiceInternal() { + isManuallyStopped = true + logToActivity("Service stop requested by MainActivity.") + connections.values.forEach { it.isManuallyStopped = true; it.handler.removeCallbacksAndMessages(null); cleanupWebSocket(it.hostUrl) } + connections.clear(); ttsEngines.values.forEach { try { it.stop() } catch (e: Exception) { /* ignore */ } } + stopForeground(STOP_FOREGROUND_REMOVE); stopSelf() + } + + override fun onDestroy() { + super.onDestroy() + isManuallyStopped = true; updateStatus("Service Stopped", false) + logToFile("Service onDestroy. Cleaning up all resources.") + ttsDiscoveryInstance?.shutdown() + ttsEngines.values.forEach { try { it.shutdown() } catch(e: Exception) { /* ignore */ } } + ttsEngines.clear(); ttsInitializedEngines.clear() + connections.values.forEach { it.handler.removeCallbacksAndMessages(null) } + connections.clear() + logToFile("--- Log session ended: ${getCurrentTimestamp()} ---", false) + stateListeners.clear(); logListeners.clear() + } + + companion object { const val EXTRA_SERVER_URLS = "com.star.provider.EXTRA_SERVER_URLS" } + private fun isTtsReady(): Boolean = ttsInitializedEngines.isNotEmpty() || activeStarVoices.isNotEmpty() + fun isRunning(): Boolean = isServiceCurrentlyRunning + fun requestCurrentStatus() { stateListeners.forEach { it.onStatusUpdate(currentStatus, isServiceCurrentlyRunning) } } + + private fun createNotificationChannel() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + val serviceChannel = NotificationChannel(CHANNEL_ID, "STAR Provider Service", NotificationManager.IMPORTANCE_LOW) + getSystemService(NotificationManager::class.java)?.createNotificationChannel(serviceChannel); + } + } + + private fun updateNotification(message: String) { + val notificationIntent = Intent(this, MainActivity::class.java) + val pendingIntentFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT else PendingIntent.FLAG_UPDATE_CURRENT + val pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, pendingIntentFlags) + val notification = NotificationCompat.Builder(this, CHANNEL_ID) + .setContentTitle("STAR Provider").setContentText(message) + .setSmallIcon(R.drawable.ic_stat_name).setContentIntent(pendingIntent) + .setOngoing(true).setOnlyAlertOnce(true).build() + (getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).notify(NOTIFICATION_ID, notification) + } + + private fun logToActivity(message: String) { Log.d("StarProviderServiceLog", message); logToFile(message); logListeners.forEach { it.onLogMessage(message) } } + + private fun initializeLogFile() { + try { + val logsDir = File(getExternalFilesDir(null), "logs"); if (!logsDir.exists()) logsDir.mkdirs() + logFile = File(logsDir, LOG_FILE_NAME); if (!logFile!!.exists()) { logFile!!.createNewFile() } + logToFile("--- Log session started: ${getCurrentTimestamp()} ---", false) + } catch (e: Exception) { Log.e("StarProviderService", "Error initializing log file", e); logFile = null } + } + + private fun getCurrentTimestamp(): String = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.getDefault()).format(Date()) + + private fun logToFile(message: String, includeTimestamp: Boolean = true) { + if (logFile == null) initializeLogFile() + logFile?.let { file -> + try { + if (file.length() > MAX_LOG_SIZE_BYTES) { + val backupFile = File(file.parentFile, BACKUP_LOG_FILE_NAME); if (backupFile.exists()) backupFile.delete() + file.renameTo(backupFile); if (file.createNewFile()) { + FileOutputStream(file, true).bufferedWriter().use { it.append("${getCurrentTimestamp()} - Log file rotated.\n") } + } + } + FileOutputStream(file, true).bufferedWriter().use { it.append(if(includeTimestamp) "${getCurrentTimestamp()} - $message\n" else "$message\n") } + } catch (e: IOException) { Log.e("StarProviderService", "Error writing to log file", e) } + } + } +} \ No newline at end of file diff --git a/provider/android/app/src/main/java/com/star/provider/ui/theme/Color.kt b/provider/android/app/src/main/java/com/star/provider/ui/theme/Color.kt new file mode 100644 index 0000000..975c557 --- /dev/null +++ b/provider/android/app/src/main/java/com/star/provider/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package com.star.provider.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/provider/android/app/src/main/java/com/star/provider/ui/theme/Theme.kt b/provider/android/app/src/main/java/com/star/provider/ui/theme/Theme.kt new file mode 100644 index 0000000..900d590 --- /dev/null +++ b/provider/android/app/src/main/java/com/star/provider/ui/theme/Theme.kt @@ -0,0 +1,58 @@ +package com.star.provider.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun StarProviderTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/provider/android/app/src/main/java/com/star/provider/ui/theme/Type.kt b/provider/android/app/src/main/java/com/star/provider/ui/theme/Type.kt new file mode 100644 index 0000000..3119680 --- /dev/null +++ b/provider/android/app/src/main/java/com/star/provider/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.star.provider.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/provider/android/app/src/main/res/drawable/ic_launcher_background.xml b/provider/android/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/provider/android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/provider/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/provider/android/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/provider/android/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/provider/android/app/src/main/res/drawable/ic_stat_name.xml b/provider/android/app/src/main/res/drawable/ic_stat_name.xml new file mode 100644 index 0000000..1670c07 --- /dev/null +++ b/provider/android/app/src/main/res/drawable/ic_stat_name.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/provider/android/app/src/main/res/drawable/ic_voice_config.xml b/provider/android/app/src/main/res/drawable/ic_voice_config.xml new file mode 100644 index 0000000..1670c07 --- /dev/null +++ b/provider/android/app/src/main/res/drawable/ic_voice_config.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/provider/android/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/provider/android/app/src/main/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/provider/android/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/provider/android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/provider/android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/provider/android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/provider/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/provider/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/provider/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/provider/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/provider/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/provider/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/provider/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/provider/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/provider/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/provider/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/provider/android/app/src/main/res/values/colors.xml b/provider/android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/provider/android/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/provider/android/app/src/main/res/values/strings.xml b/provider/android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..867e083 --- /dev/null +++ b/provider/android/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + star provider + \ No newline at end of file diff --git a/provider/android/app/src/main/res/values/themes.xml b/provider/android/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..e65b4e1 --- /dev/null +++ b/provider/android/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +