Merge pull request #148 from YAPP-Github/feature/flash159483/#147

#147: 모바일 데이터 전환시 체크 안되는 문제 수정
wespot-bff · Aug 29, 2024 · c51383f · c51383f
2 parents 34ac6a6 + 1d1aeb5
commit c51383f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <application
         android:name=".application.WeSpotApplication"
         android:allowBackup="true"

diff --git a/core/ui/src/main/kotlin/com/bff/wespot/network/NetworkStateChecker.kt b/core/ui/src/main/kotlin/com/bff/wespot/network/NetworkStateChecker.kt
@@ -8,6 +8,7 @@ import android.net.NetworkCapabilities
 import android.net.NetworkRequest
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import timber.log.Timber
 import javax.inject.Inject
 
 class NetworkStateChecker @Inject constructor(
@@ -24,11 +25,13 @@ class NetworkStateChecker @Inject constructor(
     private val networkCallback = object : ConnectivityManager.NetworkCallback() {
         override fun onAvailable(network: Network) {
             super.onAvailable(network)
+            Timber.d("Network available here")
             _networkState.value = NetworkState.Connected
         }
 
         override fun onLost(network: Network) {
             super.onLost(network)
+            Timber.d("Network lost here")
             _networkState.value = NetworkState.NotConnected
         }
     }
@@ -61,7 +64,7 @@ class NetworkStateChecker @Inject constructor(
         NetworkRequest.Builder().apply {
             validTransportTypes.onEach { addTransportType(it) }
         }.let {
-            manager.registerNetworkCallback(it.build(), networkCallback)
+            manager.requestNetwork(it.build(), networkCallback)
         }
     }
 }
diff --git a/core/ui/src/main/kotlin/com/bff/wespot/ui/TopToast.kt b/core/ui/src/main/kotlin/com/bff/wespot/ui/TopToast.kt
@@ -7,6 +7,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
 import com.bff.wespot.designsystem.component.indicator.WSToast
 import com.bff.wespot.designsystem.component.indicator.WSToastType
 
@@ -20,7 +21,8 @@ fun TopToast(
     Box(
         modifier = Modifier
             .fillMaxSize()
-            .padding(top = 12.dp),
+            .padding(top = 12.dp)
+            .zIndex(99f),
         contentAlignment = Alignment.TopCenter,
     ) {
         WSToast(