Organize shared features module structure

.gitignore

@@ -14,6 +14,7 @@ local.properties
 google-services.json
 *.jks
 .kotlin
+.gemini
 
 # Kotlin/JS and Kotlin/Wasm
 kotlin-js-store/

CLAUDE.md

@@ -18,12 +18,13 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 ## Code Style Guidelines
 - Kotlin style: Follow standard Kotlin conventions (camelCase, PascalCase)
 - Architecture: KMP (Kotlin Multiplatform) supporting Android, iOS, Desktop (JVM), and Web (WebAssembly)
-- Android UI: Uses Circuit library for UI navigation and state management
+- UI Architecture: Uses **Circuit** library for UI navigation and state management (Presenter/Ui pattern)
 - Desktop: JVM-based Compose Multiplatform application
 - Web: WebAssembly-based Compose Multiplatform application using browser APIs
 - Imports: Group by package, alphabetize within groups
 - Types: Prefer non-nullable types when possible
 - Naming: Descriptive, explicit naming (e.g., `UserRepository` not `Repository`)
 - Error handling: Use Result pattern with sealed classes for domain errors
-- Dependency injection: Uses Koin for KMP code
+- Dependency injection: Uses **kotlin-inject** for KMP code (migrating away from Koin)
+- Testing: circuit-test for presenters, Paparazzi for snapshots, truthish for assertions
 - JVM target: 11

android/app-newm/src/main/java/io/newm/HomeActivity.kt

@@ -54,12 +54,12 @@ import io.newm.shared.commonPublic.analytics.events.AppScreens
 import io.newm.shared.commonPublic.featureflags.FeatureFlagService
 import io.newm.shared.commonPublic.featureflags.FeatureFlags
 import io.newm.shared.config.NewmSharedBuildConfig
-import io.newm.sharedfeatures.devmenu.DevMenuPresenter
-import io.newm.sharedfeatures.devmenu.DevMenuUi
-import io.newm.sharedfeatures.devmenu.FeatureFlagsListPresenter
-import io.newm.sharedfeatures.devmenu.FeatureFlagsListUi
 import io.newm.sharedfeatures.screens.DevMenuMainScreen
 import io.newm.sharedfeatures.screens.FeatureFlagsListScreen
+import io.newm.sharedfeatures.screens.devmenu.DevMenuPresenter
+import io.newm.sharedfeatures.screens.devmenu.DevMenuUi
+import io.newm.sharedfeatures.screens.devmenu.featureflaglist.FeatureFlagsListPresenter
+import io.newm.sharedfeatures.screens.devmenu.featureflaglist.FeatureFlagsListUi
 import io.newm.utils.DynamicStatusBarSideEffect
 import io.newm.utils.ForceAppUpdateViewModel
 import io.newm.utils.ui

android/app-newm/src/main/java/io/newm/LoginActivity.kt

@@ -40,20 +40,20 @@ import io.newm.screens.forceupdate.openAppPlayStore
 import io.newm.shared.NewmAppLogger
 import io.newm.shared.commonPublic.analytics.NewmAppEventLogger
 import io.newm.shared.commonPublic.analytics.events.AppScreens
-import io.newm.sharedfeatures.devmenu.DevMenuPresenter
-import io.newm.sharedfeatures.devmenu.DevMenuUi
-import io.newm.sharedfeatures.devmenu.FeatureFlagsListPresenter
-import io.newm.sharedfeatures.devmenu.FeatureFlagsListUi
-import io.newm.sharedfeatures.login.LoginPresenter
-import io.newm.sharedfeatures.login.LoginUi
 import io.newm.sharedfeatures.screens.CreateAccountScreen
 import io.newm.sharedfeatures.screens.DevMenuMainScreen
 import io.newm.sharedfeatures.screens.FeatureFlagsListScreen
 import io.newm.sharedfeatures.screens.LoginScreen
 import io.newm.sharedfeatures.screens.ResetPasswordScreen
 import io.newm.sharedfeatures.screens.WelcomeScreen
-import io.newm.sharedfeatures.welcome.WelcomePresenter
-import io.newm.sharedfeatures.welcome.WelcomeUi
+import io.newm.sharedfeatures.screens.auth.login.LoginPresenter
+import io.newm.sharedfeatures.screens.auth.login.LoginUi
+import io.newm.sharedfeatures.screens.auth.welcome.WelcomePresenter
+import io.newm.sharedfeatures.screens.auth.welcome.WelcomeUi
+import io.newm.sharedfeatures.screens.devmenu.DevMenuPresenter
+import io.newm.sharedfeatures.screens.devmenu.DevMenuUi
+import io.newm.sharedfeatures.screens.devmenu.featureflaglist.FeatureFlagsListPresenter
+import io.newm.sharedfeatures.screens.devmenu.featureflaglist.FeatureFlagsListUi
 import io.newm.utils.DynamicStatusBarSideEffect
 import io.newm.utils.ForceAppUpdateViewModel
 import io.newm.utils.ui
@@ -216,7 +216,7 @@ fun WelcomeToNewm(
         )
 
     val snackbarHostState = remember { SnackbarHostState() }
-    io.newm.sharedfeatures.devmenu.DebugOverlay(
+    io.newm.sharedfeatures.screens.devmenu.DebugOverlay(
         buildConfig = config,
         onOpenDebugMenu = { circuitNavigator.goTo(DevMenuMainScreen) },
     ) {

android/app-newm/src/main/java/io/newm/NewmAppComposable.kt

@@ -69,8 +69,8 @@ import io.newm.shared.NewmAppLogger
 import io.newm.shared.commonPublic.analytics.NewmAppEventLogger
 import io.newm.shared.commonPublic.analytics.events.AppScreens
 import io.newm.shared.config.NewmSharedBuildConfig
-import io.newm.sharedfeatures.devmenu.DebugOverlay
 import io.newm.sharedfeatures.screens.DevMenuMainScreen
+import io.newm.sharedfeatures.screens.devmenu.DebugOverlay
 import kotlinx.coroutines.launch
 import com.slack.circuit.runtime.screen.Screen as CircuitScreen
 

android/app-newm/src/main/java/io/newm/NewmApplication.kt

@@ -16,7 +16,7 @@ import io.newm.shared.commonPublic.analytics.NewmAppEventLogger
 import io.newm.shared.commonPublic.featureflags.FeatureFlagService
 import io.newm.shared.config.NewmSharedBuildConfig
 import io.newm.shared.di.initKoin
-import io.newm.sharedfeatures.login.RecaptchaClientProvider
+import io.newm.sharedfeatures.screens.auth.login.RecaptchaClientProvider
 import io.newm.utils.AndroidEventLoggerImpl
 import io.newm.utils.AndroidNewmAppLogger
 import io.newm.utils.AppForegroundBackgroundTracker

android/app-newm/src/main/java/io/newm/di/android/Dependencies.kt

@@ -32,15 +32,15 @@ import io.newm.screens.walletdetail.WalletDetailPresenter
 import io.newm.screens.wallets.WalletsPresenter
 import io.newm.shared.commonPublic.featureflags.FeatureFlagDataSource
 import io.newm.shared.config.NewmSharedBuildConfig
-import io.newm.sharedfeatures.devmenu.DevMenuPresenter
-import io.newm.sharedfeatures.devmenu.FeatureFlagsListPresenter
-import io.newm.sharedfeatures.login.LoginPresenter
-import io.newm.sharedfeatures.login.RecaptchaClientProvider
-import io.newm.sharedfeatures.login.RecaptchaManager
-import io.newm.sharedfeatures.login.RecaptchaManagerImpl
-import io.newm.sharedfeatures.welcome.SocialLoginManager
-import io.newm.sharedfeatures.welcome.SocialLoginManagerImpl
-import io.newm.sharedfeatures.welcome.WelcomePresenter
+import io.newm.sharedfeatures.screens.auth.login.LoginPresenter
+import io.newm.sharedfeatures.screens.auth.login.RecaptchaClientProvider
+import io.newm.sharedfeatures.screens.auth.login.RecaptchaManager
+import io.newm.sharedfeatures.screens.auth.login.RecaptchaManagerImpl
+import io.newm.sharedfeatures.screens.auth.welcome.SocialLoginManager
+import io.newm.sharedfeatures.screens.auth.welcome.SocialLoginManagerImpl
+import io.newm.sharedfeatures.screens.auth.welcome.WelcomePresenter
+import io.newm.sharedfeatures.screens.devmenu.DevMenuPresenter
+import io.newm.sharedfeatures.screens.devmenu.featureflaglist.FeatureFlagsListPresenter
 import io.newm.utils.AndroidFeatureFlagManager
 import io.newm.utils.ForceAppUpdateViewModel
 import org.koin.android.ext.koin.androidContext

android/app-newm/src/main/java/io/newm/screens/investment/portfolio/InvestmentPortfolioPresenter.kt

@@ -14,7 +14,7 @@ import io.newm.shared.commonPublic.usecases.GetInvestmentPortfolioDataUseCase
 import io.newm.shared.commonPublic.usecases.HasWalletConnectionsUseCase
 import io.newm.shared.commonPublic.usecases.SyncWalletConnectionsUseCase
 import io.newm.shared.commonPublic.usecases.WalletNFTTracksUseCase
-import io.newm.sharedfeatures.login.RecaptchaClientProvider
+import io.newm.sharedfeatures.screens.auth.login.RecaptchaClientProvider
 import kotlinx.coroutines.flow.flowOf
 
 class InvestmentPortfolioPresenter(

android/app-newm/src/main/java/io/newm/screens/walletdetail/WalletDetailPresenter.kt

@@ -23,7 +23,7 @@ import io.newm.shared.commonPublic.usecases.FindWalletConnectionUseCase
 import io.newm.shared.commonPublic.usecases.GetInvestmentPortfolioDataUseCase
 import io.newm.shared.commonPublic.usecases.SyncWalletConnectionsUseCase
 import io.newm.shared.commonPublic.usecases.WalletNFTTracksUseCase
-import io.newm.sharedfeatures.login.RecaptchaClientProvider
+import io.newm.sharedfeatures.screens.auth.login.RecaptchaClientProvider
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.launch
 

android/app-newm/src/main/java/io/newm/utils/ForceAppUpdateViewModel.kt

@@ -3,7 +3,7 @@ package io.newm.utils
 import androidx.lifecycle.ViewModel
 import com.google.android.recaptcha.RecaptchaAction
 import io.newm.shared.commonPublic.usecases.ForceAppUpdateUseCase
-import io.newm.sharedfeatures.login.RecaptchaClientProvider
+import io.newm.sharedfeatures.screens.auth.login.RecaptchaClientProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

android/features/login/src/androidMain/kotlin/io/newm/feature/login/screen/createaccount/CreateAccountScreenPresenter.kt

@@ -22,7 +22,7 @@ import io.newm.shared.commonPublic.analytics.NewmAppEventLogger
 import io.newm.shared.commonPublic.analytics.events.AppScreens
 import io.newm.shared.commonPublic.usecases.LoginUseCase
 import io.newm.shared.commonPublic.usecases.SignupUseCase
-import io.newm.sharedfeatures.login.RecaptchaClientProvider
+import io.newm.sharedfeatures.screens.auth.login.RecaptchaClientProvider
 import kotlinx.coroutines.launch
 
 class CreateAccountScreenPresenter(

android/features/login/src/androidMain/kotlin/io/newm/feature/login/screen/resetpassword/ResetPasswordScreenPresenter.kt

@@ -25,8 +25,8 @@ import io.newm.shared.commonPublic.analytics.events.AppScreens
 import io.newm.shared.commonPublic.usecases.LoginUseCase
 import io.newm.shared.commonPublic.usecases.ResetPasswordUseCase
 import io.newm.shared.commonPublic.usecases.SignupUseCase
-import io.newm.sharedfeatures.login.RecaptchaClientProvider
 import io.newm.sharedfeatures.screens.HomeScreen
+import io.newm.sharedfeatures.screens.auth.login.RecaptchaClientProvider
 import kotlinx.coroutines.launch
 
 private enum class ResetPasswordStep {

composeapp/src/androidMain/kotlin/newm/inject/AndroidActivityComponent.kt

@@ -1,7 +1,7 @@
 package newm.inject
 
 import io.newm.shared.di.dagger.ActivityScope
-import io.newm.sharedfeatures.CommonActivityComponent
+import io.newm.sharedfeatures.di.CommonActivityComponent
 import me.tatarka.inject.annotations.Component
 
 @Component

composeapp/src/androidMain/kotlin/newm/inject/AndroidApplicationComponent.kt

@@ -4,7 +4,7 @@ import android.app.Application
 import io.newm.shared.config.NewmSharedBuildConfig
 import io.newm.shared.di.dagger.ApplicationScope
 import io.newm.shared.di.dagger.CommonApplicationComponent
-import io.newm.sharedfeatures.login.RecaptchaClientProvider
+import io.newm.sharedfeatures.screens.auth.login.RecaptchaClientProvider
 import kotlinx.coroutines.CoroutineScope
 import me.tatarka.inject.annotations.Component
 import me.tatarka.inject.annotations.Provides

composeapp/src/commonMain/kotlin/newm/App.kt

@@ -14,9 +14,9 @@ import com.slack.circuit.foundation.NavigableCircuitContent
 import com.slack.circuit.foundation.rememberCircuitNavigator
 import io.newm.core.theme.NewmTheme
 import io.newm.shared.config.NewmSharedBuildConfig
-import io.newm.sharedfeatures.devmenu.DebugOverlay
 import io.newm.sharedfeatures.screens.DevMenuMainScreen
 import io.newm.sharedfeatures.screens.WelcomeScreen
+import io.newm.sharedfeatures.screens.devmenu.DebugOverlay
 import org.jetbrains.compose.ui.tooling.preview.Preview
 
 @Composable

composeapp/src/desktopMain/kotlin/newm/inject/WindowComponent.kt

@@ -1,7 +1,7 @@
 package newm.inject
 
 import io.newm.shared.di.dagger.ActivityScope
-import io.newm.sharedfeatures.CommonActivityComponent
+import io.newm.sharedfeatures.di.CommonActivityComponent
 import me.tatarka.inject.annotations.Component
 
 @Component

composeapp/src/wasmJsMain/kotlin/newm/inject/WasmActivityComponent.kt

@@ -1,7 +1,7 @@
 package newm.inject
 
 import io.newm.shared.di.dagger.ActivityScope
-import io.newm.sharedfeatures.CommonActivityComponent
+import io.newm.sharedfeatures.di.CommonActivityComponent
 import me.tatarka.inject.annotations.Component
 
 @Component

sharedfeatures/src/androidMain/kotlin/io/newm/sharedfeatures/login/RecaptchaClientProvider.kt → sharedfeatures/src/androidMain/kotlin/io/newm/sharedfeatures/screens/auth/login/RecaptchaClientProvider.kt

@@ -1,4 +1,4 @@
-package io.newm.sharedfeatures.login
+package io.newm.sharedfeatures.screens.auth.login
 
 import com.google.android.recaptcha.RecaptchaClient
 import io.newm.shared.di.dagger.ApplicationScope

sharedfeatures/src/androidMain/kotlin/io/newm/sharedfeatures/login/RecaptchaManagerImpl.kt → sharedfeatures/src/androidMain/kotlin/io/newm/sharedfeatures/screens/auth/login/RecaptchaManagerImpl.kt

@@ -1,4 +1,4 @@
-package io.newm.sharedfeatures.login
+package io.newm.sharedfeatures.screens.auth.login
 
 import com.google.android.recaptcha.RecaptchaAction
 import me.tatarka.inject.annotations.Inject

sharedfeatures/src/androidMain/kotlin/io/newm/sharedfeatures/welcome/SocialLoginManagerImpl.kt → sharedfeatures/src/androidMain/kotlin/io/newm/sharedfeatures/screens/auth/welcome/SocialLoginManagerImpl.kt

@@ -1,4 +1,4 @@
-package io.newm.sharedfeatures.welcome
+package io.newm.sharedfeatures.screens.auth.welcome
 
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts

sharedfeatures/src/commonMain/kotlin/io/newm/sharedfeatures/CircuitComponent.kt → sharedfeatures/src/commonMain/kotlin/io/newm/sharedfeatures/di/CircuitComponent.kt

@@ -1,12 +1,12 @@
-package io.newm.sharedfeatures
+package io.newm.sharedfeatures.di
 
 import com.slack.circuit.foundation.Circuit
 import com.slack.circuit.runtime.presenter.Presenter
 import com.slack.circuit.runtime.ui.Ui
 import io.newm.shared.di.dagger.ActivityScope
-import io.newm.sharedfeatures.devmenu.DevMenuComponent
-import io.newm.sharedfeatures.login.LoginComponent
-import io.newm.sharedfeatures.welcome.WelcomeComponent
+import io.newm.sharedfeatures.screens.auth.login.LoginComponent
+import io.newm.sharedfeatures.screens.auth.welcome.WelcomeComponent
+import io.newm.sharedfeatures.screens.devmenu.DevMenuComponent
 import me.tatarka.inject.annotations.Provides
 
 interface CircuitComponent :

sharedfeatures/src/commonMain/kotlin/io/newm/sharedfeatures/CommonActivityComponent.kt → sharedfeatures/src/commonMain/kotlin/io/newm/sharedfeatures/di/CommonActivityComponent.kt

@@ -1,4 +1,4 @@
-package io.newm.sharedfeatures
+package io.newm.sharedfeatures.di
 
 import io.newm.shared.config.NewmSharedBuildConfig
 

sharedfeatures/src/commonMain/kotlin/io/newm/sharedfeatures/screens/LoginScreen.kt

@@ -3,9 +3,9 @@ package io.newm.sharedfeatures.screens
 import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import com.slack.circuit.runtime.screen.Screen
-import io.newm.sharedfeatures.login.EmailState
-import io.newm.sharedfeatures.login.PasswordState
 import io.newm.sharedfeatures.parceling.CommonParcelize
+import io.newm.sharedfeatures.screens.auth.login.EmailState
+import io.newm.sharedfeatures.screens.auth.login.PasswordState
 import org.jetbrains.compose.resources.StringResource
 
 @CommonParcelize

sharedfeatures/src/commonMain/kotlin/io/newm/sharedfeatures/login/Email.kt → sharedfeatures/src/commonMain/kotlin/io/newm/sharedfeatures/screens/auth/login/Email.kt

@@ -1,4 +1,4 @@
-package io.newm.sharedfeatures.login
+package io.newm.sharedfeatures.screens.auth.login
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.text.KeyboardActions

sharedfeatures/src/commonMain/kotlin/io/newm/sharedfeatures/login/LoginComponent.kt → sharedfeatures/src/commonMain/kotlin/io/newm/sharedfeatures/screens/auth/login/LoginComponent.kt

@@ -1,4 +1,4 @@
-package io.newm.sharedfeatures.login
+package io.newm.sharedfeatures.screens.auth.login
 
 import com.slack.circuit.runtime.presenter.Presenter
 import com.slack.circuit.runtime.ui.Ui