ajout bibliothèque méditation et changement de test
This commit is contained in:
Generated
-1
@@ -1,4 +1,3 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
|
||||
|
||||
@@ -48,6 +48,7 @@ dependencies {
|
||||
implementation(libs.compose.material3)
|
||||
implementation(libs.compose.foundation)
|
||||
implementation(libs.compose.ui.tooling)
|
||||
implementation(libs.wear)
|
||||
implementation(libs.wear.tooling.preview)
|
||||
implementation(libs.activity.compose)
|
||||
implementation(libs.core.splashscreen)
|
||||
@@ -55,4 +56,5 @@ dependencies {
|
||||
androidTestImplementation(libs.ui.test.junit4)
|
||||
debugImplementation(libs.ui.tooling)
|
||||
debugImplementation(libs.ui.test.manifest)
|
||||
// Pour la gestion du réseau simplifiée
|
||||
}
|
||||
@@ -2,6 +2,9 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||
|
||||
<uses-feature android:name="android.hardware.type.watch" />
|
||||
|
||||
@@ -18,6 +21,7 @@
|
||||
android:name="wear-sdk"
|
||||
android:required="false" />
|
||||
|
||||
|
||||
<!--
|
||||
Set to true if your app is Standalone, that is, it does not require the handheld
|
||||
app to run.
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.cesizen.app
|
||||
|
||||
import android.content.Context
|
||||
import android.os.Bundle
|
||||
import android.util.Log
|
||||
import android.widget.Toast
|
||||
@@ -29,9 +30,14 @@ import org.json.JSONObject
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
import android.net.ConnectivityManager
|
||||
import android.net.Network
|
||||
import android.net.NetworkCapabilities
|
||||
import android.net.NetworkRequest
|
||||
|
||||
class MainActivity : ComponentActivity(), DataClient.OnDataChangedListener {
|
||||
|
||||
|
||||
|
||||
private var userName by mutableStateOf<String?>(null)
|
||||
private var currentMood by mutableStateOf<String?>(null)
|
||||
private var isRefreshing by mutableStateOf(false)
|
||||
@@ -42,6 +48,21 @@ class MainActivity : ComponentActivity(), DataClient.OnDataChangedListener {
|
||||
Wearable.getDataClient(this).addListener(this)
|
||||
refreshData()
|
||||
|
||||
val connectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
|
||||
|
||||
val request = NetworkRequest.Builder()
|
||||
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
|
||||
.addTransportType(NetworkCapabilities.TRANSPORT_WIFI) // Priorité Wi-Fi
|
||||
.addTransportType(NetworkCapabilities.TRANSPORT_BLUETOOTH) // Secours Bluetooth
|
||||
.build()
|
||||
|
||||
connectivityManager.requestNetwork(request, object : ConnectivityManager.NetworkCallback() {
|
||||
override fun onAvailable(network: Network) {
|
||||
// Le système a trouvé soit du Wi-Fi, soit le pont Bluetooth du téléphone
|
||||
connectivityManager.bindProcessToNetwork(network)
|
||||
}
|
||||
})
|
||||
|
||||
setContent {
|
||||
WearApp(
|
||||
userName = userName,
|
||||
|
||||
@@ -6,6 +6,8 @@ composeBom = "2024.09.00"
|
||||
composeMaterial3 = "1.5.6"
|
||||
composeFoundation = "1.5.6"
|
||||
composeUiTooling = "1.5.6"
|
||||
playServicesWearableVersion = "18.1.0"
|
||||
wear = "1.4.0"
|
||||
wearToolingPreview = "1.0.0"
|
||||
activityCompose = "1.13.0"
|
||||
coreSplashscreen = "1.2.0"
|
||||
@@ -13,6 +15,7 @@ coreSplashscreen = "1.2.0"
|
||||
[libraries]
|
||||
play-services-wearable = { group = "com.google.android.gms", name = "play-services-wearable", version.ref = "playServicesWearable" }
|
||||
compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
|
||||
play-services-wearable-v1810 = { module = "com.google.android.gms:play-services-wearable", version.ref = "playServicesWearableVersion" }
|
||||
ui = { group = "androidx.compose.ui", name = "ui" }
|
||||
ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
|
||||
ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
|
||||
@@ -22,6 +25,7 @@ ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
|
||||
compose-material3 = { group = "androidx.wear.compose", name = "compose-material3", version.ref = "composeMaterial3" }
|
||||
compose-foundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "composeFoundation" }
|
||||
compose-ui-tooling = { group = "androidx.wear.compose", name = "compose-ui-tooling", version.ref = "composeUiTooling" }
|
||||
wear = { module = "androidx.wear:wear", version.ref = "wear" }
|
||||
wear-tooling-preview = { group = "androidx.wear", name = "wear-tooling-preview", version.ref = "wearToolingPreview" }
|
||||
activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
|
||||
core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "coreSplashscreen" }
|
||||
|
||||
Reference in New Issue
Block a user