Improve WebView retry and offline handling

android/app-newm/src/main/java/io/newm/screens/marketplace/MarketplacePresenter.kt

@@ -1,12 +1,7 @@
 package io.newm.screens.marketplace
 
-import android.content.Context
-import android.net.ConnectivityManager
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalContext
+import androidx.compose.runtime.LaunchedEffect
 import com.slack.circuit.runtime.Navigator
 import com.slack.circuit.runtime.presenter.Presenter
 import io.newm.shared.commonPublic.analytics.NewmAppEventLogger
@@ -18,23 +13,7 @@ class MarketplacePresenter(
 ) : Presenter<MarketplaceState> {
     @Composable
     override fun present(): MarketplaceState {
-        val context = LocalContext.current
-        val connectivityManager =
-            remember {
-                context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-            }
-        val isNetworkAvailable by remember {
-            mutableStateOf(connectivityManager.activeNetwork != null)
-        }
-        return when {
-            !isNetworkAvailable -> {
-                MarketplaceState.Error
-            }
-
-            else -> {
-                eventLogger.logPageLoad(AppScreens.MarketplaceScreen.name)
-                MarketplaceState.Content(eventSink = {})
-            }
-        }
+        LaunchedEffect(Unit) { eventLogger.logPageLoad(AppScreens.MarketplaceScreen.name) }
+        return MarketplaceState.Content(eventSink = {})
     }
 }

android/app-newm/src/main/java/io/newm/screens/marketplace/MarketplaceScreenUi.kt

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import io.newm.core.resources.R
 import io.newm.core.ui.LoadingScreen
@@ -23,11 +22,10 @@ fun MarketplaceScreenUi(
     state: MarketplaceState,
     eventLogger: NewmAppEventLogger,
 ) {
-    val context = LocalContext.current
     Column(modifier = modifier.fillMaxSize().statusBarsPadding()) {
         when (state) {
             is MarketplaceState.Content -> {
-                FullScreenWebView(context, MARKETPLACE_URL)
+                FullScreenWebView(url = MARKETPLACE_URL)
             }
 
             MarketplaceState.Loading -> {

android/app-newm/src/main/java/io/newm/screens/recordstore/RecordStorePresenter.kt

@@ -1,12 +1,7 @@
 package io.newm.screens.recordstore
 
-import android.content.Context
-import android.net.ConnectivityManager
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalContext
+import androidx.compose.runtime.LaunchedEffect
 import com.slack.circuit.runtime.Navigator
 import com.slack.circuit.runtime.presenter.Presenter
 import io.newm.shared.commonPublic.analytics.NewmAppEventLogger
@@ -18,23 +13,7 @@ class RecordStorePresenter(
 ) : Presenter<RecordStoreState> {
     @Composable
     override fun present(): RecordStoreState {
-        val context = LocalContext.current
-        val connectivityManager =
-            remember {
-                context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-            }
-        val isNetworkAvailable by remember {
-            mutableStateOf(connectivityManager.activeNetwork != null)
-        }
-        return when {
-            !isNetworkAvailable -> {
-                RecordStoreState.Error
-            }
-
-            else -> {
-                eventLogger.logPageLoad(AppScreens.RecordStoreScreen.name)
-                RecordStoreState.Content(eventSink = {})
-            }
-        }
+        LaunchedEffect(Unit) { eventLogger.logPageLoad(AppScreens.RecordStoreScreen.name) }
+        return RecordStoreState.Content(eventSink = {})
     }
 }

android/app-newm/src/main/java/io/newm/screens/recordstore/RecordStoreScreenUi.kt

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import io.newm.core.resources.R
@@ -25,11 +24,10 @@ fun RecordStoreScreenUi(
     state: RecordStoreState,
     eventLogger: NewmAppEventLogger,
 ) {
-    val context = LocalContext.current
     Column(modifier = modifier.fillMaxSize().statusBarsPadding().testTag(TAG_NFT_LIBRARY_SCREEN)) {
         when (state) {
             is RecordStoreState.Content -> {
-                FullScreenWebView(context, RECORD_STORE_URL)
+                FullScreenWebView(url = RECORD_STORE_URL)
             }
 
             RecordStoreState.Loading -> {

android/app-newm/src/main/java/io/newm/screens/studio/StudioPresenter.kt

@@ -1,14 +1,11 @@
 package io.newm.screens.studio
 
-import android.content.Context
-import android.net.ConnectivityManager
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.LocalContext
 import com.slack.circuit.runtime.Navigator
 import com.slack.circuit.runtime.presenter.Presenter
 import io.newm.shared.commonInternal.TokenManager
@@ -22,15 +19,6 @@ class StudioPresenter(
 ) : Presenter<StudioState> {
     @Composable
     override fun present(): StudioState {
-        val context = LocalContext.current
-        val connectivityManager =
-            remember {
-                context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-            }
-        val isNetworkAvailable by remember {
-            mutableStateOf(connectivityManager.activeNetwork != null)
-        }
-
         var accessToken by remember { mutableStateOf<String?>(null) }
         var refreshToken by remember { mutableStateOf<String?>(null) }
         var isLoading by remember { mutableStateOf(true) }
@@ -47,12 +35,8 @@ class StudioPresenter(
                 StudioState.Loading
             }
 
-            !isNetworkAvailable -> {
-                StudioState.Error
-            }
-
             else -> {
-                eventLogger.logPageLoad(AppScreens.MarketplaceScreen.name)
+                LaunchedEffect(Unit) { eventLogger.logPageLoad(AppScreens.StudioScreen.name) }
                 StudioState.Content(
                     eventSink = {},
                     accessToken = accessToken,

android/app-newm/src/main/java/io/newm/screens/studio/StudioScreenUi.kt

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import io.newm.core.resources.R
 import io.newm.core.ui.LoadingScreen
@@ -23,12 +22,10 @@ fun StudioScreenUi(
     state: StudioState,
     eventLogger: NewmAppEventLogger,
 ) {
-    val context = LocalContext.current
     Column(modifier = modifier.fillMaxSize().statusBarsPadding()) {
         when (state) {
             is StudioState.Content -> {
                 FullScreenWebView(
-                    context = context,
                     url = STUDIO_URL,
                     accessToken = state.accessToken,
                     refreshToken = state.refreshToken,

core-resources/src/androidMain/res/values/strings.xml

@@ -126,6 +126,9 @@
     <string name="record_store" translatable="false">RecordStore</string>
     <string name="record_store_error_message">It looks like you\'re not connected to the internet. Please check your connection and try again.</string>
     <string name="record_store_error_title">Connection Lost</string>
+    <string name="web_view_load_error_title">Unable to load page</string>
+    <string name="web_view_load_error_message">Something went wrong while loading this page. Please try again.</string>
+    <string name="web_view_retry">Retry</string>
     <string name="reset_password_confirm_new_password">Confirm new password</string>
     <string name="reset_password_enter_email">Enter your email to receive reset instructions.</string>
     <string name="reset_password_enter_email_continue">Continue</string>

core-resources/src/commonMain/composeResources/values/strings.xml

@@ -126,6 +126,9 @@
     <string name="record_store" translatable="false">RecordStore</string>
     <string name="record_store_error_message">It looks like you\'re not connected to the internet. Please check your connection and try again.</string>
     <string name="record_store_error_title">Connection Lost</string>
+    <string name="web_view_load_error_title">Unable to load page</string>
+    <string name="web_view_load_error_message">Something went wrong while loading this page. Please try again.</string>
+    <string name="web_view_retry">Retry</string>
     <string name="reset_password_confirm_new_password">Confirm new password</string>
     <string name="reset_password_enter_email">Enter your email to receive reset instructions.</string>
     <string name="reset_password_enter_email_continue">Continue</string>

core-ui/src/androidMain/kotlin/io/newm/core/ui/utils/ErrorScreen.kt

@@ -6,18 +6,22 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import io.newm.core.ui.buttons.PrimaryButton
 
 @Composable
 fun ErrorScreen(
     title: String,
     message: String,
+    actionLabel: String? = null,
+    onAction: (() -> Unit)? = null,
 ) {
     Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize().padding(16.dp)) {
         Column(horizontalAlignment = Alignment.CenterHorizontally) {
@@ -34,6 +38,14 @@ fun ErrorScreen(
                 textAlign = TextAlign.Center,
                 modifier = Modifier.padding(horizontal = 16.dp),
             )
+            if (actionLabel != null && onAction != null) {
+                Spacer(modifier = Modifier.height(24.dp))
+                PrimaryButton(
+                    text = actionLabel,
+                    onClick = onAction,
+                    modifier = Modifier.widthIn(max = 280.dp),
+                )
+            }
         }
     }
 }