fritz/tv-controller-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: fritz:52099b2e09ac0a5cfeb85f0c837c6244f72c05b3
Branches Tags
fritz:main
fritz:webrtc
fritz:working
..
compare: fritz:7a871f9fa4f3a7209770da83846d3b31b749750f
Branches Tags
fritz:main
fritz:webrtc
fritz:working

No commits in common. "52099b2e09ac0a5cfeb85f0c837c6244f72c05b3" and "7a871f9fa4f3a7209770da83846d3b31b749750f" have entirely different histories.
52099b2e09 ... 7a871f9fa4

6 changed files with 15 additions and 107 deletions
Show Stats Expand all files Collapse all files

14
app/src/main/java/com/example/tvcontroller/MainActivity.kt
View File

@ -31,13 +31,11 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.res.painterResource
import androidx.lifecycle.viewmodel.compose.viewModel
import com.example.tvcontroller.services.BluetoothService
import com.example.tvcontroller.services.DeviceService
import com.example.tvcontroller.ui.AppViewModel
class MainActivity : ComponentActivity() {
private lateinit var bluetoothService: BluetoothService
private lateinit var deviceService: DeviceService
private val appViewModel by viewModels<AppViewModel>()
override fun onCreate(savedInstanceState: Bundle?) {
@ -45,15 +43,10 @@ class MainActivity : ComponentActivity() {
bluetoothService = BluetoothService(this.applicationContext)
bluetoothService.onBluetoothStateChanged { state -> appViewModel.setBluetoothEnabled(state == BluetoothAdapter.STATE_ON) }
appViewModel.setBluetoothEnabled(bluetoothService.isBluetoothEnabled())
deviceService = DeviceService(this.applicationContext)
enableEdgeToEdge()
setContent {
TVControllerTheme {
TvControllerApp(
appViewModel = appViewModel,
bluetoothService = bluetoothService,
deviceService = deviceService
)
TvControllerApp(appViewModel = appViewModel, bluetoothService = bluetoothService)
}
}
}
@ -63,8 +56,7 @@ class MainActivity : ComponentActivity() {
fun TvControllerApp(
navController: NavHostController = rememberNavController(),
appViewModel: AppViewModel = viewModel(),
bluetoothService: BluetoothService? = null,
deviceService: DeviceService
bluetoothService: BluetoothService? = null
) {
val backStackEntry by navController.currentBackStackEntryAsState()
val currentScreen = Screen.valueOf(backStackEntry?.destination?.route ?: Screen.Camera.name)
@ -121,7 +113,7 @@ fun TvControllerApp(
RemoteScreen()
}
composable(route = Screen.Settings.name) {
SettingsScreen(appViewModel = appViewModel, deviceService = deviceService)
SettingsScreen(appViewModel = appViewModel)
}
}
}

8
app/src/main/java/com/example/tvcontroller/Settings.kt
View File

@ -1,8 +0,0 @@
package com.example.tvcontroller
object Settings {
enum class ConnectionState {
Unregistered,
Registered,
}
}

18
app/src/main/java/com/example/tvcontroller/SettingsScreen.kt
View File

@ -16,13 +16,11 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import com.example.tvcontroller.services.DeviceService
import com.example.tvcontroller.ui.AppViewModel
@Composable
fun SettingsScreen(deviceService: DeviceService, appViewModel: AppViewModel) {
val viewModel =
viewModel<SettingsViewModel>(factory = SettingsViewModel.provideFactory(deviceService))
fun SettingsScreen(appViewModel: AppViewModel = viewModel()) {
val viewModel = viewModel<SettingsViewModel>()
Column(
modifier = Modifier
@ -40,9 +38,7 @@ fun SettingsScreen(deviceService: DeviceService, appViewModel: AppViewModel) {
style = MaterialTheme.typography.headlineSmall
)
Text(
text = stringResource(id = R.string.server_connection_label) + ": " + getConnectionStateString(
viewModel.connectionState
),
text = stringResource(id = R.string.server_connection_label) + ": " + stringResource(id = R.string.connection_state_disconnected),
style = MaterialTheme.typography.bodyMedium
)
OutlinedTextField(
@ -86,11 +82,3 @@ fun SettingsScreen(deviceService: DeviceService, appViewModel: AppViewModel) {
}
}
}
@Composable
fun getConnectionStateString(state: Settings.ConnectionState): String {
return when (state) {
Settings.ConnectionState.Unregistered -> stringResource(id = R.string.connection_state_unregistered)
Settings.ConnectionState.Registered -> stringResource(id = R.string.connection_state_registered)
}
}

36
app/src/main/java/com/example/tvcontroller/SettingsViewModel.kt
View File

@ -4,40 +4,23 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.viewModelScope
import com.example.tvcontroller.services.DeviceService
import kotlinx.coroutines.launch
class SettingsViewModel(private val deviceService: DeviceService) : ViewModel() {
var serverAddress by mutableStateOf(deviceService.getServerAddress())
class SettingsViewModel : ViewModel() {
var serverAddress by mutableStateOf(DeviceService.getServerAddress())
private set
var deviceName by mutableStateOf(android.os.Build.MANUFACTURER + " " + android.os.Build.MODEL)
private set
var registrationCode by mutableStateOf("")
private set
var connectionState by mutableStateOf(Settings.ConnectionState.Unregistered)
private set
init {
checkConnectionState()
}
fun connect() {
//Log.i("SettingsScreen", "Save settings: $serverUrl, $deviceName, $registrationCode")
viewModelScope.launch {
deviceService.setServerAddress(serverAddress)
deviceService.createIntegration(deviceName, registrationCode)
checkConnectionState()
}
}
private fun checkConnectionState() {
connectionState = if (deviceService.getToken().isEmpty()) {
Settings.ConnectionState.Unregistered
return
} else {
Settings.ConnectionState.Registered
DeviceService.setServerAddress(serverAddress)
DeviceService.createIntegration(deviceName, registrationCode)
}
}
@ -52,15 +35,4 @@ class SettingsViewModel(private val deviceService: DeviceService) : ViewModel()
fun onRegistrationCodeChanged(code: String) {
registrationCode = code
}
companion object {
fun provideFactory(
deviceService: DeviceService,
) = object : ViewModelProvider.Factory {
@Suppress("UNCHECKED_CAST")
override fun <T : ViewModel> create(modelClass: Class<T>): T {
return SettingsViewModel(deviceService) as T
}
}
}
}

44
app/src/main/java/com/example/tvcontroller/services/DeviceService.kt
View File

@ -1,7 +1,5 @@
package com.example.tvcontroller.services
import android.content.Context
import android.content.Context.MODE_PRIVATE
import android.util.Log
import io.ktor.client.engine.cio.*
import io.ktor.client.*
@ -13,59 +11,31 @@ import io.ktor.client.statement.HttpResponse
import io.ktor.http.HttpMethod
import org.json.JSONObject
private const val SHARED_PREFERENCES_NAME = "devices";
class DeviceService(private val context: Context) {
object DeviceService {
private var client = HttpClient(CIO)
private var serverAddress: String = ""
private var token: String = ""
init {
loadPreferences()
}
suspend fun createIntegration(name: String, code: String) {
Log.i("DeviceService", "Creating integration for $name with code $code at $serverAddress")
val requestJson = JSONObject()
requestJson.put("name", name)
requestJson.put("code", code)
val json = JSONObject()
json.put("name", name)
json.put("code", code)
try {
val response: HttpResponse = client.request("http://$serverAddress/api/integrations") {
method = HttpMethod.Post
setBody(requestJson.toString())
setBody(json.toString())
headers {
append("Content-Type", "application/json")
}
}
val body: String = response.body()
val responseJson = JSONObject(body)
token = responseJson.getString("token")
savePreferences()
Log.i("DeviceService", "Response: ${response.status.value} $body")
} catch (e: Exception) {
Log.e("DeviceService", "Error creating integration", e)
}
}
private fun loadPreferences() {
val sharedPreferences = context.getSharedPreferences(SHARED_PREFERENCES_NAME, MODE_PRIVATE)
serverAddress = sharedPreferences.getString("server_address", "")!!
token = sharedPreferences.getString("token", "")!!
Log.i("DeviceService", "Loaded preferences: $serverAddress $token")
}
private fun savePreferences() {
val sharedPreferences = context.getSharedPreferences(SHARED_PREFERENCES_NAME, MODE_PRIVATE)
val editor = sharedPreferences.edit()
editor.apply {
putString("server_address", serverAddress)
putString("token", token)
apply()
}
}
fun setServerAddress(url: String) {
serverAddress = url
}
@ -73,8 +43,4 @@ class DeviceService(private val context: Context) {
fun getServerAddress(): String {
return serverAddress
}
fun getToken(): String {
return token
}
}

2
app/src/main/res/values/strings.xml
View File

@ -11,6 +11,4 @@
<string name="save_button_label">Save</string>
<string name="connect_button_label">Connect</string>
<string name="server_address_label">Server address</string>
<string name="connection_state_unregistered">unregistered</string>
<string name="connection_state_registered">registered</string>
</resources>