Add DEV UI support for SOCKS proxy port

app/src/main/java/com/pyamsoft/tetherfi/PreferencesImpl.kt

@@ -39,6 +39,9 @@ import com.pyamsoft.tetherfi.server.TweakPreferences
 import com.pyamsoft.tetherfi.server.WifiPreferences
 import com.pyamsoft.tetherfi.server.broadcast.BroadcastType
 import com.pyamsoft.tetherfi.server.network.PreferredNetwork
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.random.Random
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -48,9 +51,6 @@ import kotlinx.coroutines.flow.combineTransform
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
-import javax.inject.Inject
-import javax.inject.Singleton
-import kotlin.random.Random
 
 @Singleton
 internal class PreferencesImpl

app/src/main/java/com/pyamsoft/tetherfi/info/InfoEntry.kt

@@ -23,6 +23,7 @@ import com.pyamsoft.pydroid.ui.inject.ComposableInjector
 import com.pyamsoft.pydroid.ui.inject.rememberComposableInjector
 import com.pyamsoft.pydroid.ui.util.rememberNotNull
 import com.pyamsoft.tetherfi.ObjectGraph
+import com.pyamsoft.tetherfi.core.FeatureFlags
 import com.pyamsoft.tetherfi.ui.ServerViewState
 import javax.inject.Inject
 
@@ -43,6 +44,7 @@ internal class InfoInjector : ComposableInjector() {
 fun InfoEntry(
     modifier: Modifier = Modifier,
     appName: String,
+    featureFlags: FeatureFlags,
     serverViewState: ServerViewState,
     onShowQRCode: () -> Unit,
     onShowSlowSpeedHelp: () -> Unit,
@@ -54,6 +56,7 @@ fun InfoEntry(
       modifier = modifier,
       state = viewModel,
       appName = appName,
+      featureFlags = featureFlags,
       serverViewState = serverViewState,
       onShowQRCode = onShowQRCode,
       onShowSlowSpeedHelp = onShowSlowSpeedHelp,

app/src/main/java/com/pyamsoft/tetherfi/main/MainContent.kt

@@ -23,6 +23,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import com.pyamsoft.tetherfi.connections.ConnectionEntry
+import com.pyamsoft.tetherfi.core.FeatureFlags
 import com.pyamsoft.tetherfi.info.InfoEntry
 import com.pyamsoft.tetherfi.server.status.RunningStatus
 import com.pyamsoft.tetherfi.status.StatusEntry
@@ -32,6 +33,7 @@ import com.pyamsoft.tetherfi.ui.ServerViewState
 fun MainContent(
     modifier: Modifier = Modifier,
     appName: String,
+    featureFlags: FeatureFlags,
     pagerState: PagerState,
     state: ServerViewState,
     allTabs: List<MainView>,
@@ -70,6 +72,7 @@ fun MainContent(
         InfoEntry(
             modifier = Modifier.fillMaxSize(),
             appName = appName,
+            featureFlags = featureFlags,
             serverViewState = state,
             onShowQRCode = onShowQRCode,
             onShowSlowSpeedHelp = onShowSlowSpeedHelp,
@@ -78,6 +81,7 @@ fun MainContent(
       MainView.STATUS -> {
         StatusEntry(
             modifier = Modifier.fillMaxSize(),
+            featureFlags = featureFlags,
             appName = appName,
             serverViewState = state,
             onShowQRCode = onShowQRCode,

app/src/main/java/com/pyamsoft/tetherfi/main/MainEntry.kt

@@ -44,6 +44,7 @@ import com.pyamsoft.pydroid.ui.util.fillUpToPortraitSize
 import com.pyamsoft.pydroid.ui.util.rememberNotNull
 import com.pyamsoft.tetherfi.ObjectGraph
 import com.pyamsoft.tetherfi.core.AppDevEnvironment
+import com.pyamsoft.tetherfi.core.FeatureFlags
 import com.pyamsoft.tetherfi.core.Timber
 import com.pyamsoft.tetherfi.qr.QRCodeEntry
 import com.pyamsoft.tetherfi.server.broadcast.BroadcastNetworkStatus
@@ -68,10 +69,9 @@ internal class MainInjector @Inject internal constructor() : ComposableInjector(
   @JvmField @Inject internal var viewModel: MainViewModeler? = null
 
   @JvmField @Inject internal var appEnvironment: AppDevEnvironment? = null
-
   @JvmField @Inject internal var permissionRequestBus: EventBus<PermissionRequests>? = null
-
   @JvmField @Inject internal var permissionResponseBus: EventConsumer<PermissionResponse>? = null
+  @JvmField @Inject internal var featureFlags: FeatureFlags? = null
 
   override fun onInject(activity: ComponentActivity) {
     ObjectGraph.ActivityScope.retrieve(activity).inject(this)
@@ -82,6 +82,7 @@ internal class MainInjector @Inject internal constructor() : ComposableInjector(
     appEnvironment = null
     permissionRequestBus = null
     permissionResponseBus = null
+    featureFlags = null
   }
 }
 
@@ -206,6 +207,7 @@ fun MainEntry(
   val appEnvironment = rememberNotNull(component.appEnvironment)
   val permissionRequestBus = rememberNotNull(component.permissionRequestBus)
   val permissionResponseBus = rememberNotNull(component.permissionResponseBus)
+  val featureFlags = rememberNotNull(component.featureFlags)
 
   // Use the LifecycleOwner.CoroutineScope (Activity usually)
   // so that the scope does not die because of navigation events
@@ -241,6 +243,7 @@ fun MainEntry(
       modifier = modifier,
       appName = appName,
       state = viewModel,
+      featureFlags = featureFlags,
       pagerState = pagerState,
       allTabs = allTabs,
       onTabChanged = { handleTabSelected(it) },

app/src/main/java/com/pyamsoft/tetherfi/main/MainScreen.kt

@@ -28,11 +28,13 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import com.pyamsoft.pydroid.ui.util.rememberAsStateList
+import com.pyamsoft.tetherfi.core.FeatureFlags
 import com.pyamsoft.tetherfi.server.broadcast.BroadcastNetworkStatus
 import com.pyamsoft.tetherfi.server.broadcast.BroadcastType
 import com.pyamsoft.tetherfi.server.network.PreferredNetwork
 import com.pyamsoft.tetherfi.server.status.RunningStatus
 import com.pyamsoft.tetherfi.service.prereq.HotspotStartBlocker
+import com.pyamsoft.tetherfi.ui.test.makeTestFeatureFlags
 import kotlinx.coroutines.flow.MutableStateFlow
 import org.jetbrains.annotations.TestOnly
 
@@ -41,6 +43,7 @@ fun MainScreen(
     modifier: Modifier = Modifier,
     appName: String,
     state: MainViewState,
+    featureFlags: FeatureFlags,
     pagerState: PagerState,
     allTabs: List<MainView>,
 
@@ -88,6 +91,7 @@ fun MainScreen(
                   .heightIn(
                       min = remember(pv) { pv.calculateBottomPadding() },
                   ),
+          featureFlags = featureFlags,
           appName = appName,
           pagerState = pagerState,
           state = state,
@@ -122,7 +126,9 @@ private fun PreviewMainScreen(
         override val isShowingSlowSpeedHelp = MutableStateFlow(isShowingSlowSpeedHelp)
         override val group = MutableStateFlow(BroadcastNetworkStatus.GroupInfo.Empty)
         override val connection = MutableStateFlow(BroadcastNetworkStatus.ConnectionInfo.Empty)
-        override val port = MutableStateFlow(0)
+
+        override val httpPort = MutableStateFlow(0)
+        override val socksPort = MutableStateFlow(0)
 
         // TODO support RNDIS
         override val broadcastType = MutableStateFlow(BroadcastType.WIFI_DIRECT)
@@ -143,6 +149,7 @@ private fun PreviewMainScreen(
   val allTabs = MainView.entries.rememberAsStateList()
 
   MainScreen(
+      featureFlags = makeTestFeatureFlags(),
       appName = "TEST",
       state = state,
       pagerState = rememberPagerState { allTabs.size },

app/src/main/java/com/pyamsoft/tetherfi/status/StatusEntry.kt

@@ -35,6 +35,7 @@ import com.pyamsoft.pydroid.ui.inject.ComposableInjector
 import com.pyamsoft.pydroid.ui.inject.rememberComposableInjector
 import com.pyamsoft.pydroid.ui.util.rememberNotNull
 import com.pyamsoft.tetherfi.ObjectGraph
+import com.pyamsoft.tetherfi.core.FeatureFlags
 import com.pyamsoft.tetherfi.server.status.RunningStatus
 import com.pyamsoft.tetherfi.ui.ServerViewState
 import javax.inject.Inject
@@ -140,6 +141,7 @@ fun StatusEntry(
     modifier: Modifier = Modifier,
     appName: String,
     serverViewState: ServerViewState,
+    featureFlags: FeatureFlags,
 
     // Actions
     onShowQRCode: () -> Unit,
@@ -186,6 +188,7 @@ fun StatusEntry(
       state = viewModel,
       serverViewState = serverViewState,
       appName = appName,
+      featureFlags = featureFlags,
       onShowQRCode = onShowQRCode,
       onRefreshConnection = onRefreshConnection,
       onJumpToHowTo = onJumpToHowTo,
@@ -196,7 +199,8 @@ fun StatusEntry(
       },
       onSsidChanged = { viewModel.handleSsidChanged(it.trim()) },
       onPasswordChanged = { viewModel.handlePasswordChanged(it) },
-      onPortChanged = { viewModel.handlePortChanged(it) },
+      onHttpPortChanged = { viewModel.handlePortChanged(it, ServerPortTypes.HTTP) },
+      onSocksPortChanged = { viewModel.handlePortChanged(it, ServerPortTypes.SOCKS) },
       onViewSlowSpeedHelp = onShowSlowSpeedHelp,
       onOpenBatterySettings = {
         onLaunchIntent(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS)

info/src/main/java/com/pyamsoft/tetherfi/info/InfoScreen.kt

@@ -29,11 +29,13 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import com.pyamsoft.pydroid.theme.keylines
+import com.pyamsoft.tetherfi.core.FeatureFlags
 import com.pyamsoft.tetherfi.ui.LANDSCAPE_MAX_WIDTH
 import com.pyamsoft.tetherfi.ui.ServerViewState
 import com.pyamsoft.tetherfi.ui.renderLinks
 import com.pyamsoft.tetherfi.ui.renderPYDroidExtras
 import com.pyamsoft.tetherfi.ui.test.TestServerState
+import com.pyamsoft.tetherfi.ui.test.makeTestFeatureFlags
 import com.pyamsoft.tetherfi.ui.test.makeTestServerState
 
 private enum class InfoContentTypes {
@@ -45,6 +47,7 @@ private enum class InfoContentTypes {
 fun InfoScreen(
     modifier: Modifier = Modifier,
     appName: String,
+    featureFlags: FeatureFlags,
     state: InfoViewState,
     serverViewState: ServerViewState,
     onTogglePasswordVisibility: () -> Unit,
@@ -79,6 +82,7 @@ fun InfoScreen(
         itemModifier = Modifier.widthIn(max = LANDSCAPE_MAX_WIDTH),
         appName = appName,
         state = state,
+        featureFlags = featureFlags,
         serverViewState = serverViewState,
         onTogglePasswordVisibility = onTogglePasswordVisibility,
         onShowQRCode = onShowQRCode,
@@ -100,6 +104,7 @@ fun InfoScreen(
 private fun PreviewInfoScreen() {
   InfoScreen(
       appName = "TEST",
+      featureFlags = makeTestFeatureFlags(),
       state = MutableInfoViewState(),
       serverViewState = makeTestServerState(TestServerState.EMPTY),
       onTogglePasswordVisibility = {},

info/src/main/java/com/pyamsoft/tetherfi/info/RenderConnectionInstructions.kt

@@ -25,12 +25,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import com.pyamsoft.pydroid.theme.keylines
+import com.pyamsoft.tetherfi.core.FeatureFlags
 import com.pyamsoft.tetherfi.info.sections.renderAppSetup
 import com.pyamsoft.tetherfi.info.sections.renderConnectionComplete
 import com.pyamsoft.tetherfi.info.sections.renderDeviceIdentifiers
 import com.pyamsoft.tetherfi.info.sections.renderDeviceSetup
 import com.pyamsoft.tetherfi.ui.ServerViewState
 import com.pyamsoft.tetherfi.ui.test.TestServerState
+import com.pyamsoft.tetherfi.ui.test.makeTestFeatureFlags
 import com.pyamsoft.tetherfi.ui.test.makeTestServerState
 import org.jetbrains.annotations.TestOnly
 
@@ -41,6 +43,7 @@ private enum class ConnectionInstructionContentTypes {
 internal fun LazyListScope.renderConnectionInstructions(
     itemModifier: Modifier = Modifier,
     appName: String,
+    featureFlags: FeatureFlags,
     state: InfoViewState,
     serverViewState: ServerViewState,
     onShowQRCode: () -> Unit,
@@ -85,6 +88,7 @@ internal fun LazyListScope.renderConnectionInstructions(
       itemModifier = itemModifier,
       appName = appName,
       state = state,
+      featureFlags = featureFlags,
       serverViewState = serverViewState,
       onTogglePasswordVisibility = onTogglePasswordVisibility,
       onShowQRCode = onShowQRCode,
@@ -119,6 +123,7 @@ private fun PreviewConnectionInstructions(state: InfoViewState, server: TestServ
   LazyColumn {
     renderConnectionInstructions(
         appName = "TEST",
+        featureFlags = makeTestFeatureFlags(),
         serverViewState = makeTestServerState(server),
         state = state,
         onTogglePasswordVisibility = {},