diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..e3a86b4 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +pilot \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..ae388c2 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..44ca2d9 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,41 @@ + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..0fc3113 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..8978d23 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..67a7214 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,74 @@ +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") + id("kotlin-parcelize") +} + +android { + namespace = "com.helible.pilot" + compileSdk = 33 + + defaultConfig { + applicationId = "com.helible.pilot" + minSdk = 28 + targetSdk = 33 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + } + + buildTypes { + release { + isMinifyEnabled = false + 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 { + kotlinCompilerExtensionVersion = "1.4.3" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + + implementation("androidx.core:core-ktx:1.9.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") + implementation("androidx.activity:activity-compose:1.7.2") + implementation(platform("androidx.compose:compose-bom:2023.03.00")) + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.ui:ui-graphics") + implementation("androidx.compose.ui:ui-tooling-preview") + implementation("androidx.compose.material3:material3") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1") + implementation("androidx.constraintlayout:constraintlayout-compose:1.0.1") + implementation("androidx.navigation:navigation-compose:2.6.0") + implementation("com.google.code.gson:gson:2.10.1") + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.1.5") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00")) + androidTestImplementation("androidx.compose.ui:ui-test-junit4") + debugImplementation("androidx.compose.ui:ui-tooling") + debugImplementation("androidx.compose.ui:ui-test-manifest") +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/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/app/release/app-release.apk b/app/release/app-release.apk new file mode 100644 index 0000000..9fec070 Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 0000000..850a9f6 --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.helible.pilot", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "1.0", + "outputFile": "app-release.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/app/src/androidTest/java/com/helible/pilot/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/helible/pilot/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..1493533 --- /dev/null +++ b/app/src/androidTest/java/com/helible/pilot/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.helible.pilot + +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.gogacoder.testblue", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..cd31548 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/helible/pilot/BluetoothHelper.kt b/app/src/main/java/com/helible/pilot/BluetoothHelper.kt new file mode 100644 index 0000000..2c358ef --- /dev/null +++ b/app/src/main/java/com/helible/pilot/BluetoothHelper.kt @@ -0,0 +1,70 @@ +package com.helible.pilot + +import android.annotation.SuppressLint +import android.bluetooth.BluetoothSocket +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharedFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asSharedFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.onCompletion +import java.io.IOException +import java.util.UUID + +sealed interface ConnectionResult { + object ConnectionEstablished: ConnectionResult + data class Error(val message: String) : ConnectionResult +} + +interface BluetoothController { + val isConnected: StateFlow + val errors: SharedFlow + + fun connectToDevice(device: Device?): Flow + fun closeConnection() +} + +class AndroidBluetoothController : BluetoothController { + + private val _isConnected: MutableStateFlow = MutableStateFlow(false) + override val isConnected: StateFlow + get() = _isConnected.asStateFlow() + + private val _errors = MutableSharedFlow() + override val errors: SharedFlow + get() = _errors.asSharedFlow() + + private var currentClientSocket: BluetoothSocket? = null + + companion object { + const val SERVICE_UUID = "af7cc14b-cffa-4a3d-b677-01b0ff0a93d7" + } + + @SuppressLint("MissingPermission") + override fun connectToDevice(device: Device?): Flow { + return flow { + currentClientSocket = device?.bluetoothDevice?.createRfcommSocketToServiceRecord( + UUID.fromString(SERVICE_UUID) + ) + currentClientSocket?.let { socket -> + try { + socket.connect() + emit(ConnectionResult.ConnectionEstablished) + } catch (e: IOException) { + closeConnection() + emit(ConnectionResult.Error("Connection was interrupted")) + } + } + }.onCompletion { closeConnection() }.flowOn(Dispatchers.IO) + } + + override fun closeConnection() { + currentClientSocket?.close() + currentClientSocket = null + } +} diff --git a/app/src/main/java/com/helible/pilot/MainActivity.kt b/app/src/main/java/com/helible/pilot/MainActivity.kt new file mode 100644 index 0000000..4fea030 --- /dev/null +++ b/app/src/main/java/com/helible/pilot/MainActivity.kt @@ -0,0 +1,249 @@ +package com.helible.pilot + +import android.Manifest +import android.annotation.SuppressLint +import android.bluetooth.BluetoothAdapter +import android.bluetooth.BluetoothManager +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.location.LocationManager +import android.os.Build +import android.os.Bundle +import android.os.Handler +import android.os.Looper +import android.util.Log +import android.widget.Toast +import androidx.activity.ComponentActivity +import androidx.activity.compose.ManagedActivityResultLauncher +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.compose.setContent +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.style.TextAlign +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.rememberNavController +import com.helible.pilot.components.BluetoothScannerScreen +import com.helible.pilot.components.PreferencesCacheImpl +import com.helible.pilot.components.SavedPreferences +import com.helible.pilot.ui.theme.TestblueTheme +import java.util.concurrent.Executors + +@SuppressLint("MissingPermission") +class MainActivity : ComponentActivity() { + // TODO: delegate part of Intent filters logic to BluetoothController + // TODO: move bluetooth states and stateFlow to new BluetoothViewModel + // TODO: replace field bluetoothDevice in Device to deviceAddress field + // TODO: replace some mutableStates to stateFlows + // TODO: share selected device via PersistentViewModel + // TODO: check permissions inside other classes (and throw an exception, if one of this isn't granted) + // TODO: add stub instead of the DevicesList, if there aren't nearby devices + // TODO: add Bluetooth data transfer... + // TODO: add text strings to resource + val mainViewModel: MainViewModel = MainViewModel(AndroidBluetoothController()) + + private val bluetoothManager: BluetoothManager by lazy { + getSystemService(BluetoothManager::class.java) + } + private val bluetoothAdapter: BluetoothAdapter? by lazy { + bluetoothManager.adapter + } + private var permissionsViewModel = PermissionDialogViewModel() + private lateinit var permissionLauncher: ManagedActivityResultLauncher, Map> + + private val permissionsToRequest: Array by lazy { + if (Build.VERSION.SDK_INT <= 30) { + arrayOf( + Manifest.permission.ACCESS_FINE_LOCATION + ) + } else { + arrayOf( + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_CONNECT, + Manifest.permission.BLUETOOTH_ADMIN + ) + } + } + + private val locationManager: LocationManager by lazy { + getSystemService(LOCATION_SERVICE) as LocationManager + } + private val preferencesCache by lazy { + PreferencesCacheImpl(getSharedPreferences(packageName, Context.MODE_PRIVATE)) + } + private val preferencesViewModel by lazy { + PersistentViewModel(preferencesCache) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + mainViewModel.bluetoothTurnOnState.value = bluetoothAdapter?.isEnabled + mainViewModel.locationTurnOnState.value = + locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) + + setContent { + this.permissionLauncher = rememberLauncherForActivityResult( + contract = ActivityResultContracts.RequestMultiplePermissions(), + onResult = { perms -> + permissionsToRequest.forEach { permission -> + permissionsViewModel.onPermissionResult( + permission = permission, + isGranted = perms[permission] == true + ) + } + } + ) + + val state by mainViewModel.state.collectAsState() + + LaunchedEffect(key1 = state.errorMessage) { + state.errorMessage?.let { message -> + Toast.makeText(applicationContext, message, Toast.LENGTH_LONG).show() + } + } + LaunchedEffect(key1 = state) { + if (state.isConnected) { + Toast.makeText(applicationContext, "Подключение завершено", Toast.LENGTH_LONG) + .show() + } + } + + val navController = rememberNavController() + TestblueTheme { + Surface(color = MaterialTheme.colorScheme.background) { + PermissionsRequest( + dismissCurrentDialog = { permissionsViewModel.dismissDialog() }, + visiblePermissionDialogQueue = permissionsViewModel.visiblePermissionDialogQueue, + activity = this, + permissionLauncher = permissionLauncher + ) + + RequestHardwareFeatures( + activity = this, + turnOnLocation = Manifest.permission.ACCESS_FINE_LOCATION in permissionsToRequest, + bluetoothTurnOnState = mainViewModel.bluetoothTurnOnState, + locationTurnOnState = mainViewModel.locationTurnOnState + ) + + NavHost(navController = navController, startDestination = "scanner") { + composable("scanner") { + BluetoothScannerScreen( + devices = mainViewModel.devices, + selectedDevice = mainViewModel.selectedDevice, + bluetoothIsDiscoveringState = mainViewModel.isBluetoothDiscoveryRunning, + bluetoothAdapter = bluetoothAdapter, + onScreenChanged = { + bluetoothAdapter?.cancelDiscovery() + preferencesViewModel.savePreferences( + SavedPreferences( + mainViewModel.selectedDevice.value?.bluetoothDevice?.address + ) + ) + navController.navigate("flight") + Log.i( + "ScanActivity", + "Preferences: ${preferencesViewModel.preferences}" + ) + } + ) + } + composable("flight") { + + LaunchedEffect(Unit) { + // TODO: refactor + val device: Device = mainViewModel.selectedDevice.value!! + mainViewModel.connectToDevice(device) + } + when { + state.isConnecting -> { + Column( + modifier = Modifier.fillMaxSize(), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + CircularProgressIndicator() + Text(text = "Подключение...", textAlign = TextAlign.Center) + } + } + + else -> { + Text( + text = "Device name: ${mainViewModel.selectedDevice.value?.bluetoothDevice?.name}", + modifier = Modifier.fillMaxSize(), + textAlign = TextAlign.Center + ) + } + } + } + } + } + } + } + registerIntentFilters(this, receiver) + requestPermissions() + } + + private val receiver = object : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent) { + receiveIntentChanges( + intent, + mainViewModel, + bluetoothAdapter, + locationManager + ) + } + } + + private fun requestPermissions() { + Executors.newSingleThreadExecutor().execute { + Handler(Looper.getMainLooper()).post { + permissionLauncher.launch(permissionsToRequest) + } + } + } + + override fun onDestroy() { + unregisterReceiver(receiver) + super.onDestroy() + Log.i("ScanActivity", "ACTIVITY DESTROYED") + bluetoothAdapter?.cancelDiscovery() + try { + unregisterReceiver(receiver) + } catch (e: IllegalArgumentException) { + Log.e( + "ScanActivity", + "Receiver wasn't registered ${e.localizedMessage}\nStackTrace: ${e.stackTrace}" + ) + } + } + + override fun onStart() { + super.onStart() + if (bluetoothAdapter?.isDiscovering != true) + bluetoothAdapter?.startDiscovery() + Log.i("ScanActivity", "ACTIVITY STARTED") + } + + override fun onStop() { + super.onStop() + bluetoothAdapter?.cancelDiscovery() + mainViewModel.devices.clear() + mainViewModel.selectedDevice.value = null + Log.i("ScanActivity", "ACTIVITY STOPPED") + } +} + + diff --git a/app/src/main/java/com/helible/pilot/MainViewModel.kt b/app/src/main/java/com/helible/pilot/MainViewModel.kt new file mode 100644 index 0000000..11c6ff0 --- /dev/null +++ b/app/src/main/java/com/helible/pilot/MainViewModel.kt @@ -0,0 +1,133 @@ +package com.helible.pilot + +import android.bluetooth.BluetoothDevice +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.mutableStateListOf +import androidx.compose.runtime.mutableStateOf +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.helible.pilot.components.SavedPreferences +import com.helible.pilot.components.SavedPreferencesCache +import kotlinx.coroutines.Job +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.catch +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.flow.update + +data class Device( + val bluetoothDevice: BluetoothDevice, + val rssi: Short, +) + +data class BluetoothUiState( + val isConnected: Boolean = false, + val isConnecting: Boolean = false, + val errorMessage: String? = null +) + +class MainViewModel( + private val bluetoothController: BluetoothController +) : ViewModel() { + val devices: MutableList = mutableStateListOf() + val selectedDevice: MutableState = mutableStateOf(null) + val bluetoothTurnOnState: MutableState = mutableStateOf(false) + val locationTurnOnState: MutableState = mutableStateOf(null) + val isBluetoothDiscoveryRunning: MutableState = mutableStateOf(false) + + private val _bluetoothState = MutableStateFlow(BluetoothUiState()) + val state: StateFlow + get() = _bluetoothState.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), _bluetoothState.value) + + init { + bluetoothController.isConnected.onEach { + isConnected -> _bluetoothState.update { it.copy(isConnected = isConnected) } + }.launchIn(viewModelScope) + bluetoothController.errors.onEach { error -> + _bluetoothState.update { + it.copy(errorMessage = error) + } + }.launchIn(viewModelScope) + } + + private fun Flow.listen(): Job { + return onEach { result -> + when(result) { + ConnectionResult.ConnectionEstablished -> { + _bluetoothState.update { + it.copy( + isConnected = true, + isConnecting = false, + errorMessage = null + ) + } + } + is ConnectionResult.Error -> { + _bluetoothState.update { it.copy( + isConnected = false, + isConnecting = false, + errorMessage = result.message + ) } + } + } + } + .catch { throwable -> + bluetoothController.closeConnection() + _bluetoothState.update { + it.copy( + isConnected = false, + isConnecting = false + ) + } + } + .launchIn(viewModelScope) + } + private var deviceConnectionJob: Job? = null + + fun connectToDevice(device: Device) { + _bluetoothState.update {it.copy(isConnecting = true)} + deviceConnectionJob = bluetoothController + .connectToDevice(device) + .listen() + } + + fun disconnectFromDevice() { + deviceConnectionJob?.cancel() + bluetoothController.closeConnection() + _bluetoothState.update { + it.copy( + isConnecting = false, + isConnected = false + ) + } + } +} + +class PermissionDialogViewModel: ViewModel() { + val visiblePermissionDialogQueue = mutableStateListOf() + + fun dismissDialog() { + visiblePermissionDialogQueue.removeFirst() + } + + fun onPermissionResult(permission: String, isGranted: Boolean) { + if(!isGranted && !visiblePermissionDialogQueue.contains(permission)){ + visiblePermissionDialogQueue.add(permission) + } + } +} + +class PersistentViewModel( + private val preferencesCache: SavedPreferencesCache, +) : ViewModel() { + val preferences get() = preferencesCache.getPreferences() + fun savePreferences(savedPreferences: SavedPreferences) { + preferencesCache.savePreferences( + preferences = savedPreferences + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/helible/pilot/PermissionsRequest.kt b/app/src/main/java/com/helible/pilot/PermissionsRequest.kt new file mode 100644 index 0000000..ad22353 --- /dev/null +++ b/app/src/main/java/com/helible/pilot/PermissionsRequest.kt @@ -0,0 +1,70 @@ +package com.helible.pilot + +import android.Manifest +import android.app.Activity +import android.content.Intent +import android.content.pm.PackageManager +import android.net.Uri +import android.provider.Settings +import androidx.activity.compose.ManagedActivityResultLauncher +import androidx.compose.runtime.Composable +import androidx.compose.runtime.snapshots.SnapshotStateList +import com.helible.pilot.components.BluetoothAdminPermissionTextProvider +import com.helible.pilot.components.BluetoothConnectPermissionTextProvider +import com.helible.pilot.components.BluetoothScanPermissionTextProvider +import com.helible.pilot.components.LocationPermissionTextProvider +import com.helible.pilot.components.PermissionDialog + +@Composable +fun PermissionsRequest( + visiblePermissionDialogQueue: SnapshotStateList, + dismissCurrentDialog: () -> Unit, + activity: Activity, + permissionLauncher: ManagedActivityResultLauncher, Map> +) { + /* Create Dialog windows, which requests all permissions */ + visiblePermissionDialogQueue.reversed() + .forEach { permission -> + PermissionDialog( + permissionTextProvider = when (permission) { + Manifest.permission.ACCESS_FINE_LOCATION -> { + LocationPermissionTextProvider() + } + + Manifest.permission.BLUETOOTH_SCAN -> { + BluetoothScanPermissionTextProvider() + } + + Manifest.permission.BLUETOOTH_CONNECT -> { + BluetoothConnectPermissionTextProvider() + } + + Manifest.permission.BLUETOOTH_ADMIN -> { + BluetoothAdminPermissionTextProvider() + } + + else -> return@forEach + }, + isPermanentDeclined = !activity.shouldShowRequestPermissionRationale(permission), + onDismiss = { + if (activity.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED) + dismissCurrentDialog() + }, + onOkClick = { + dismissCurrentDialog() + permissionLauncher.launch(arrayOf(permission)) + }, + onContinueClick = { + if (activity.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED) + dismissCurrentDialog() + }, + onGoToAppSettingsClick = { + val intent = Intent( + Settings.ACTION_APPLICATION_DETAILS_SETTINGS, + Uri.fromParts("package", activity.packageName, null) + ) + activity.startActivity(intent) + } + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/helible/pilot/ReceiveIntentChanges.kt b/app/src/main/java/com/helible/pilot/ReceiveIntentChanges.kt new file mode 100644 index 0000000..5ca5702 --- /dev/null +++ b/app/src/main/java/com/helible/pilot/ReceiveIntentChanges.kt @@ -0,0 +1,86 @@ +package com.helible.pilot + +import android.annotation.SuppressLint +import android.app.Activity +import android.bluetooth.BluetoothAdapter +import android.bluetooth.BluetoothDevice +import android.content.BroadcastReceiver +import android.content.Intent +import android.content.IntentFilter +import android.location.LocationManager +import android.os.Build +import android.util.Log + + +fun registerIntentFilters(activity: Activity, receiver: BroadcastReceiver) { + activity.registerReceiver(receiver, IntentFilter(BluetoothDevice.ACTION_FOUND)) + activity.registerReceiver(receiver, IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED)) + activity.registerReceiver(receiver, IntentFilter(BluetoothAdapter.ACTION_DISCOVERY_STARTED)) + activity.registerReceiver(receiver, IntentFilter(BluetoothAdapter.ACTION_DISCOVERY_FINISHED)) + if (Build.VERSION.SDK_INT <= 30) + activity.registerReceiver(receiver, IntentFilter(LocationManager.PROVIDERS_CHANGED_ACTION)) +} + +@SuppressLint("MissingPermission") +fun receiveIntentChanges( + intent: Intent, + mainViewModel: MainViewModel, + bluetoothAdapter: BluetoothAdapter?, + locationManager: LocationManager, +) { + when (intent.action) { + BluetoothDevice.ACTION_FOUND -> { + val device = if (Build.VERSION.SDK_INT >= 33) { + intent.getParcelableExtra( + BluetoothDevice.EXTRA_DEVICE, + BluetoothDevice::class.java + ) + } else { + @Suppress("DEPRECATION") intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE) + } + + val rssi = intent.getShortExtra(BluetoothDevice.EXTRA_RSSI, Short.MIN_VALUE) + if (device?.name != null) + mainViewModel.devices.add(Device(device, rssi)) + Log.i( + "ScanActivity", + "Found new device: ${device?.name} ${device?.address} $rssi" + ) + } + + BluetoothAdapter.ACTION_STATE_CHANGED -> { + val state: Int = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1) + Log.i("ScanActvity", "Bluetooth state: $state") + when (state) { + BluetoothAdapter.STATE_ON -> { + Log.i("ScanActvity", "Bluetooth turned on") + mainViewModel.bluetoothTurnOnState.value = true + mainViewModel.devices.clear() + bluetoothAdapter?.startDiscovery() + } + + BluetoothAdapter.STATE_OFF -> { + Log.i("ScanActvity", "Bluetooth turned off") + mainViewModel.bluetoothTurnOnState.value = false + } + } + } + LocationManager.PROVIDERS_CHANGED_ACTION -> { + mainViewModel.locationTurnOnState.value = locationManager.isLocationEnabled + if (mainViewModel.locationTurnOnState.value == true) { + Log.i("ScanActivity", "LOCATION IS ON") + } else if (mainViewModel.locationTurnOnState.value == false) + Log.i("ScanActivity", "LOCATION IS OFF") + } + + BluetoothAdapter.ACTION_DISCOVERY_FINISHED -> { + mainViewModel.isBluetoothDiscoveryRunning.value = false + Log.i("ScanActivity", "DISCOVERY FINISHED") + } + + BluetoothAdapter.ACTION_DISCOVERY_STARTED -> { + mainViewModel.isBluetoothDiscoveryRunning.value = true + Log.i("ScanActivity", "DISCOVERY STARTED") + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/helible/pilot/RequestHardwareFeatures.kt b/app/src/main/java/com/helible/pilot/RequestHardwareFeatures.kt new file mode 100644 index 0000000..68dc3d2 --- /dev/null +++ b/app/src/main/java/com/helible/pilot/RequestHardwareFeatures.kt @@ -0,0 +1,46 @@ +package com.helible.pilot + +import android.annotation.SuppressLint +import android.app.Activity +import android.bluetooth.BluetoothAdapter +import android.content.Intent +import android.provider.Settings +import androidx.compose.runtime.Composable +import androidx.compose.runtime.MutableState +import com.helible.pilot.components.RequiredHardwareFeatures + +@SuppressLint("MissingPermission") +@Composable +fun RequestHardwareFeatures( + activity: Activity, + turnOnLocation: Boolean, + bluetoothTurnOnState: MutableState, + locationTurnOnState: MutableState +) +{ + RequiredHardwareFeatures( + title = "Включите Bluetooth", + description = "Для работы приложения требуется Bluetooth", + confirmButtonText = "Включить Bluetooth", + featureState = bluetoothTurnOnState, + requestFeature = { + val intent = Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE) + activity.startActivity(intent) + }, + onDismissRequest = {} + ) + + if (turnOnLocation) { + RequiredHardwareFeatures( + title = "Пожалуйста, включите геолокацию", + description = "Для работы с Bluetooth на устройствах с Android 11 и более ранних версиях, " + + "требуется геолокация.", + confirmButtonText = "Включить геолокацию", + featureState = locationTurnOnState, + requestFeature = { + val intent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS) + activity.startActivity(intent) + } + ) {} + } +} \ No newline at end of file diff --git a/app/src/main/java/com/helible/pilot/components/BluetoothScannerScreen.kt b/app/src/main/java/com/helible/pilot/components/BluetoothScannerScreen.kt new file mode 100644 index 0000000..3a2cb4f --- /dev/null +++ b/app/src/main/java/com/helible/pilot/components/BluetoothScannerScreen.kt @@ -0,0 +1,118 @@ +package com.helible.pilot.components + +import android.annotation.SuppressLint +import android.bluetooth.BluetoothAdapter +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material3.Button +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.FilledIconToggleButton +import androidx.compose.material3.Icon +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.MutableState +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.constraintlayout.compose.ConstraintLayout +import androidx.constraintlayout.compose.Dimension +import com.helible.pilot.Device + + +@SuppressLint("MissingPermission") +@Composable +fun BluetoothScannerScreen( + devices: MutableList, + selectedDevice: MutableState, + bluetoothIsDiscoveringState: MutableState, + bluetoothAdapter: BluetoothAdapter?, + onScreenChanged: () -> Unit, + modifier: Modifier = Modifier +) { + Surface( + modifier = modifier, + ) { + ConstraintLayout(modifier = Modifier.fillMaxSize()) { + val (title, devicesList, controls) = createRefs() + + Title( + text = "Поиск устройств", + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 10.dp) + .constrainAs(title) {} + ) + + DiscoveredDevicesList( + devices = devices, + selectedDevice = selectedDevice, + modifier = Modifier + .constrainAs(devicesList) { + top.linkTo(title.bottom) + bottom.linkTo(controls.top) + height = Dimension.fillToConstraints + } + ) + + if (devices.isEmpty() && bluetoothIsDiscoveringState.value) { + Box( + modifier = Modifier.fillMaxSize() + ) { + CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) + } + } + + Row( + modifier = Modifier + .padding(5.dp) + .constrainAs(controls) { + bottom.linkTo(parent.bottom) + width = Dimension.matchParent + height = Dimension.fillToConstraints + }, + horizontalArrangement = Arrangement.Center + ) { + FilledIconToggleButton( + checked = bluetoothIsDiscoveringState.value, + onCheckedChange = { + selectedDevice.value = null + if (bluetoothIsDiscoveringState.value) + bluetoothAdapter?.cancelDiscovery() + else { + devices.clear() + bluetoothAdapter?.startDiscovery() + } + }, modifier = Modifier + .align(Alignment.Bottom) + .padding(5.dp) + ) { + Icon( + if (bluetoothIsDiscoveringState.value) Icons.Filled.Close + else Icons.Filled.Refresh, + contentDescription = null + ) + } + Button( + onClick = { + onScreenChanged() + }, + modifier = Modifier + .align(Alignment.Bottom) + .padding(5.dp), + enabled = selectedDevice.value != null, + ) { + Text(text = "Далее") + } + } + + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/helible/pilot/components/DeviceItem.kt b/app/src/main/java/com/helible/pilot/components/DeviceItem.kt new file mode 100644 index 0000000..8bd8dbd --- /dev/null +++ b/app/src/main/java/com/helible/pilot/components/DeviceItem.kt @@ -0,0 +1,71 @@ +package com.helible.pilot.components + +import android.annotation.SuppressLint +import android.widget.TextView +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.ElevatedCard +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.MutableState +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.viewinterop.AndroidView +import androidx.core.text.HtmlCompat +import com.helible.pilot.Device +import com.helible.pilot.R + +@SuppressLint("MissingPermission") +@Composable +fun DeviceItem(deviceInfo: Device, selectedDevice: MutableState, modifier: Modifier) { + ElevatedCard( + modifier=modifier.clickable { + selectedDevice.value = deviceInfo + }, + colors = CardDefaults.elevatedCardColors(containerColor = if (deviceInfo.bluetoothDevice == selectedDevice.value?.bluetoothDevice) + MaterialTheme.colorScheme.secondaryContainer + else MaterialTheme.colorScheme.surface + ) + ) { + Row(modifier=Modifier.padding(8.dp)) { + Column(verticalArrangement = Arrangement.Center) { + Text(text=deviceInfo.bluetoothDevice.name, fontWeight = FontWeight.Bold, softWrap = true) + AndroidView(factory = { context -> + TextView(context).apply { + // Using old TextView for text formatting + text = HtmlCompat.fromHtml("MAC: ${deviceInfo.bluetoothDevice.address}", HtmlCompat.FROM_HTML_MODE_LEGACY) + } + }) + } + Box(contentAlignment = Alignment.CenterEnd, modifier = Modifier.fillMaxSize()) { + Icon( + painterResource(id = getSignalIconForRssiValue(deviceInfo.rssi)), + contentDescription = null, + modifier = Modifier + .fillMaxHeight() + .padding(10.dp), + tint = MaterialTheme.colorScheme.primary + ) + } + } + } +} + +fun getSignalIconForRssiValue(rssi: Short): Int{ + if (rssi >= -80) return R.drawable.signal_icon4 + else if (rssi >= -90) return R.drawable.signal_icon3 + else if (rssi >= -100) return R.drawable.signal_icon2 + return R.drawable.signal_icon1 +} \ No newline at end of file diff --git a/app/src/main/java/com/helible/pilot/components/DiscoveredDevicesList.kt b/app/src/main/java/com/helible/pilot/components/DiscoveredDevicesList.kt new file mode 100644 index 0000000..263c5fb --- /dev/null +++ b/app/src/main/java/com/helible/pilot/components/DiscoveredDevicesList.kt @@ -0,0 +1,28 @@ +package com.helible.pilot.components + +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.runtime.Composable +import androidx.compose.runtime.MutableState +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import com.helible.pilot.Device + +@Composable +fun DiscoveredDevicesList(devices: MutableList, selectedDevice: MutableState, modifier: Modifier = Modifier) { + LazyColumn(modifier = modifier) { + items(devices) { device -> + DeviceItem( + deviceInfo = device, + selectedDevice = selectedDevice, + modifier = Modifier + .fillMaxWidth() + .padding( + 5.dp + ) + ) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/helible/pilot/components/FeatureRequestDialog.kt b/app/src/main/java/com/helible/pilot/components/FeatureRequestDialog.kt new file mode 100644 index 0000000..3fa2bcd --- /dev/null +++ b/app/src/main/java/com/helible/pilot/components/FeatureRequestDialog.kt @@ -0,0 +1,38 @@ +package com.helible.pilot.components + +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Divider +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.MutableState +import androidx.compose.ui.Modifier + +@Composable +fun RequiredHardwareFeatures( + title: String, + description: String, + confirmButtonText: String, + featureState: MutableState, + requestFeature: () -> Unit, + onDismissRequest: () -> Unit +) { + if (featureState.value == false || featureState.value == null) { + AlertDialog( + confirmButton = { + Divider() + TextButton(onClick = requestFeature, modifier = Modifier.fillMaxWidth()) { + Text(text=confirmButtonText) + } + }, + onDismissRequest = onDismissRequest, + text = { + Text( + text = description + ) + }, + title = { Text(text = title)} + ) + } +} diff --git a/app/src/main/java/com/helible/pilot/components/PermissionDialog.kt b/app/src/main/java/com/helible/pilot/components/PermissionDialog.kt new file mode 100644 index 0000000..dce70db --- /dev/null +++ b/app/src/main/java/com/helible/pilot/components/PermissionDialog.kt @@ -0,0 +1,130 @@ +package com.helible.pilot.components + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Divider +import androidx.compose.material3.Text +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp + +@Composable +fun PermissionDialog( + permissionTextProvider: PermissionTextProvider, + isPermanentDeclined: Boolean, + onDismiss: () -> Unit, + onOkClick: () -> Unit, + onContinueClick: () -> Unit, + onGoToAppSettingsClick: () -> Unit, + modifier: Modifier = Modifier +) { + AlertDialog( + onDismissRequest = onDismiss, + title = { Text(text = "Требуется разрешение") }, + confirmButton = { + Column( + modifier = Modifier.fillMaxWidth() + ) { + Divider() + Text( + text = if (isPermanentDeclined) { + "Выдать разрешение" + } else { + "OK" + }, + fontWeight = FontWeight.Bold, + textAlign = TextAlign.Center, + modifier = Modifier + .fillMaxWidth() + .clickable { + if (isPermanentDeclined) { + onGoToAppSettingsClick() + } else { + onOkClick() + } + } + .padding(16.dp) + ) + } + }, + dismissButton = {if(isPermanentDeclined) + Box(modifier=Modifier.fillMaxWidth()){ + Divider() + Text( + text = "Снова проверить наличие разрешения", + modifier = Modifier + .fillMaxWidth() + .padding(paddingValues = PaddingValues(top=10.dp)) + .clickable {onContinueClick()}, + fontWeight = FontWeight.Bold, + textAlign = TextAlign.Center + )} + else + Unit}, + text = { + Text(text = permissionTextProvider.getDescription( + isPermanentDeclined = isPermanentDeclined + )) + }, + modifier = modifier + ) +} + +interface PermissionTextProvider { + fun getDescription(isPermanentDeclined: Boolean): String +} + +class LocationPermissionTextProvider : PermissionTextProvider { + override fun getDescription(isPermanentDeclined: Boolean): String { + return if (isPermanentDeclined){ + "Похоже вы навсегда запретили приложению доступ к геолокации. " + + "Вы можете зайти в настройки, чтобы выдать это разрешение." + } else { + "Приложению необходимо разрешение для определения местоположения " + + "для работы с Bluetooth на устройствах с Android 11 и ниже." + } + } +} + +class BluetoothScanPermissionTextProvider : PermissionTextProvider { + override fun getDescription(isPermanentDeclined: Boolean): String { + return if (isPermanentDeclined){ + "Похоже вы навсегда запретили приложению доступ к сканированию по Bluetooth. " + + "Вы можете зайти в настройки, чтобы выдать это разрешение." + } else { + "Приложению необходимо разрешение для к сканированию по Bluetooth " + + "для работы с Bluetooth на устройствах с Android 11 и ниже" + } + } +} + +class BluetoothConnectPermissionTextProvider : PermissionTextProvider { + override fun getDescription(isPermanentDeclined: Boolean): String { + return if (isPermanentDeclined){ + "Похоже вы навсегда запретили приложению доступ к подключению по Bluetooth." + + "Вы можете зайти в настройки, чтобы выдать это разрешение." + } else { + "Приложению необходимо разрешение для к подключению по Bluetooth." + + "для работы с Bluetooth на устройствах с Android 11 и ниже" + } + } +} + +class BluetoothAdminPermissionTextProvider : PermissionTextProvider { + override fun getDescription(isPermanentDeclined: Boolean): String { + return if (isPermanentDeclined){ + "Похоже вы навсегда запретили приложению доступ к управлению настройками Bluetooth. " + + "Вы можете зайти в настройки, чтобы выдать это разрешение." + } else { + "Приложению необходимо разрешение для к управлению настройками Bluetooth " + + "для работы с Bluetooth на устройствах с Android 11 и ниже" + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/helible/pilot/components/SavedPreferences.kt b/app/src/main/java/com/helible/pilot/components/SavedPreferences.kt new file mode 100644 index 0000000..b37bb3e --- /dev/null +++ b/app/src/main/java/com/helible/pilot/components/SavedPreferences.kt @@ -0,0 +1,37 @@ +package com.helible.pilot.components + +import android.content.SharedPreferences +import android.os.Parcelable +import com.google.gson.Gson +import kotlinx.parcelize.Parcelize + + +@Parcelize +data class SavedPreferences( + val deviceAddress: String? +): Parcelable + +interface SavedPreferencesCache { + fun getPreferences(): SavedPreferences? + fun savePreferences(preferences: SavedPreferences) + fun clearPreferences() +} + +class PreferencesCacheImpl(private val sharedPreferences: SharedPreferences) : SavedPreferencesCache { + override fun getPreferences(): SavedPreferences? { + val json = sharedPreferences.getString("preferences", null) ?: return null + return Gson().fromJson(json, SavedPreferences::class.java) + } + override fun savePreferences(preferences: SavedPreferences) + { + sharedPreferences.edit() + .putString("preferences", Gson().toJson(preferences)) + .apply() + + } + + override fun clearPreferences() + { + sharedPreferences.edit().remove("preferences").apply() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/helible/pilot/components/Title.kt b/app/src/main/java/com/helible/pilot/components/Title.kt new file mode 100644 index 0000000..714fa00 --- /dev/null +++ b/app/src/main/java/com/helible/pilot/components/Title.kt @@ -0,0 +1,19 @@ +package com.helible.pilot.components + +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.sp + +@Composable +fun Title(text: String, modifier: Modifier = Modifier) { + Text( + text = text, + textAlign = TextAlign.Center, + modifier = modifier, + fontSize = 23.sp, + fontWeight = FontWeight.Bold + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/helible/pilot/ui/theme/Color.kt b/app/src/main/java/com/helible/pilot/ui/theme/Color.kt new file mode 100644 index 0000000..075fcba --- /dev/null +++ b/app/src/main/java/com/helible/pilot/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package com.helible.pilot.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/app/src/main/java/com/helible/pilot/ui/theme/Theme.kt b/app/src/main/java/com/helible/pilot/ui/theme/Theme.kt new file mode 100644 index 0000000..6ad91a4 --- /dev/null +++ b/app/src/main/java/com/helible/pilot/ui/theme/Theme.kt @@ -0,0 +1,70 @@ +package com.helible.pilot.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.runtime.SideEffect +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +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 TestblueTheme( + 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 + } + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.primary.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/helible/pilot/ui/theme/Type.kt b/app/src/main/java/com/helible/pilot/ui/theme/Type.kt new file mode 100644 index 0000000..5c31011 --- /dev/null +++ b/app/src/main/java/com/helible/pilot/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.helible.pilot.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/app/src/main/res/drawable/ic_android_black_24dp.xml b/app/src/main/res/drawable/ic_android_black_24dp.xml new file mode 100644 index 0000000..fe51230 --- /dev/null +++ b/app/src/main/res/drawable/ic_android_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/signal_icon1.xml b/app/src/main/res/drawable/signal_icon1.xml new file mode 100644 index 0000000..12cd878 --- /dev/null +++ b/app/src/main/res/drawable/signal_icon1.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/signal_icon2.xml b/app/src/main/res/drawable/signal_icon2.xml new file mode 100644 index 0000000..7152a69 --- /dev/null +++ b/app/src/main/res/drawable/signal_icon2.xml @@ -0,0 +1,20 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/signal_icon3.xml b/app/src/main/res/drawable/signal_icon3.xml new file mode 100644 index 0000000..b7dd77d --- /dev/null +++ b/app/src/main/res/drawable/signal_icon3.xml @@ -0,0 +1,20 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/signal_icon4.xml b/app/src/main/res/drawable/signal_icon4.xml new file mode 100644 index 0000000..932ac4b --- /dev/null +++ b/app/src/main/res/drawable/signal_icon4.xml @@ -0,0 +1,20 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/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/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..2d01e9b --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Digital Pilot + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..21ebef7 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +