Merge pull request #112 from fmasa/feat/compendium-visibility

Compendium item visiblity

Author: fmasa

app/src/main/kotlin/cz/muni/fi/rpg/ui/shell/Startup.kt

@@ -2,18 +2,20 @@ package cz.muni.fi.rpg.ui.shell
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import cz.frantisekmasa.wfrp_master.common.auth.LocalAuthenticationManager
+import cz.frantisekmasa.wfrp_master.common.auth.AuthenticationManager
 import cz.frantisekmasa.wfrp_master.common.core.auth.LocalUser
 import cz.frantisekmasa.wfrp_master.common.core.ui.flow.collectWithLifecycle
 import cz.muni.fi.rpg.ui.startup.StartupScreen
+import org.kodein.di.compose.localDI
+import org.kodein.di.instance
 
 @Composable
 fun Startup(content: @Composable () -> Unit) {
-    val auth = LocalAuthenticationManager.current
+    val auth: AuthenticationManager by localDI().instance()
     val user = auth.user.collectWithLifecycle().value
 
     if (user == null) {
-        StartupScreen()
+        StartupScreen(auth)
         return
     }
 

app/src/main/kotlin/cz/muni/fi/rpg/ui/startup/StartupScreen.kt

@@ -15,7 +15,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
 import com.google.android.gms.auth.api.signin.GoogleSignIn
-import cz.frantisekmasa.wfrp_master.common.auth.LocalAuthenticationManager
+import cz.frantisekmasa.wfrp_master.common.auth.AuthenticationManager
 import cz.frantisekmasa.wfrp_master.common.auth.LocalWebClientId
 import cz.frantisekmasa.wfrp_master.common.core.shared.SettingsStorage
 import cz.frantisekmasa.wfrp_master.common.core.shared.edit
@@ -32,11 +32,9 @@ import org.kodein.di.compose.localDI
 import org.kodein.di.instance
 
 @Composable
-fun StartupScreen() {
+fun StartupScreen(authenticationManager: AuthenticationManager) {
     SplashScreen()
 
-    val authenticationManager = LocalAuthenticationManager.current
-
     val authenticated by authenticationManager.authenticated.collectWithLifecycle()
 
     Napier.d("Authenticated: $authenticated")

common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/DependencyInjection.kt

@@ -7,6 +7,7 @@ import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.firestore.ktx.firestoreSettings
 import com.google.firebase.functions.ktx.functions
 import com.google.firebase.ktx.Firebase
+import cz.frantisekmasa.wfrp_master.common.auth.AuthenticationManager
 import cz.frantisekmasa.wfrp_master.common.core.shared.SettingsStorage
 import cz.frantisekmasa.wfrp_master.common.firebase.firestore.Firestore
 import cz.frantisekmasa.wfrp_master.common.firebase.functions.CloudFunctions
@@ -36,6 +37,8 @@ actual val platformModule = DI.Module("android") {
         Firestore(firestore)
     }
 
+    bindSingleton { AuthenticationManager(instance()) }
+
     bindSingleton {
         val functions = Firebase.functions
         val url = BuildConfig.FUNCTIONS_EMULATOR_URL

common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/auth/AuthenticationManager.kt

@@ -9,9 +9,9 @@ import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.FirebaseAuthUserCollisionException
 import com.google.firebase.auth.GoogleAuthProvider
-import com.google.firebase.auth.ktx.auth
-import com.google.firebase.ktx.Firebase
 import cz.frantisekmasa.wfrp_master.common.core.auth.User
+import cz.frantisekmasa.wfrp_master.common.core.auth.UserId
+import cz.frantisekmasa.wfrp_master.common.core.auth.UserProvider
 import cz.frantisekmasa.wfrp_master.common.core.logging.Reporter
 import io.github.aakira.napier.Napier
 import kotlinx.coroutines.CoroutineScope
@@ -25,10 +25,9 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
 
-val LocalAuthenticationManager = staticCompositionLocalOf { AuthenticationManager(Firebase.auth) }
 val LocalWebClientId = staticCompositionLocalOf<String> { error("LocalWebTokenId was not set") }
 
-class AuthenticationManager(private val auth: FirebaseAuth) {
+class AuthenticationManager(private val auth: FirebaseAuth) : UserProvider {
     val coroutineScope = CoroutineScope(Dispatchers.Default)
 
     val authenticated: StateFlow<Boolean?> = callbackFlow {
@@ -63,11 +62,13 @@ class AuthenticationManager(private val auth: FirebaseAuth) {
         awaitClose { auth.removeAuthStateListener(listener) }
     }.map {
         User(
-            id = it.uid,
+            id = UserId(it.uid),
             email = if (it.email == "") null else it.email
         )
     }.stateIn(coroutineScope, SharingStarted.Eagerly, null)
 
+    override val userId: UserId? get() = user.value?.id
+
     init {
         coroutineScope.launch {
             user.collect { it?.let { Reporter.setUserId(it.id) } }

common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/logging/Reporter.kt

@@ -4,12 +4,13 @@ import com.google.firebase.analytics.ktx.analytics
 import com.google.firebase.analytics.ktx.logEvent
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.ktx.Firebase
+import cz.frantisekmasa.wfrp_master.common.core.auth.UserId
 
 actual object Reporter {
     private val crashlytics by lazy { FirebaseCrashlytics.getInstance() }
 
-    actual fun setUserId(id: String) {
-        crashlytics.setUserId(id)
+    actual fun setUserId(id: UserId) {
+        crashlytics.setUserId(id.toString())
     }
 
     actual fun log(message: String) {

common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/settings/SignInCard.kt

@@ -36,7 +36,7 @@ import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.firebase.auth.FirebaseAuthUserCollisionException
-import cz.frantisekmasa.wfrp_master.common.auth.LocalAuthenticationManager
+import cz.frantisekmasa.wfrp_master.common.auth.AuthenticationManager
 import cz.frantisekmasa.wfrp_master.common.auth.LocalWebClientId
 import cz.frantisekmasa.wfrp_master.common.core.auth.LocalUser
 import cz.frantisekmasa.wfrp_master.common.core.shared.Resources
@@ -56,10 +56,12 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
 import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
+import org.kodein.di.compose.localDI
+import org.kodein.di.instance
 
 @Composable
 actual fun SignInCard(settingsScreenModel: SettingsScreenModel) {
-    val authManager = LocalAuthenticationManager.current
+    val authManager: AuthenticationManager by localDI().instance()
     val webClientId = LocalWebClientId.current
     val contract = remember(authManager) { authManager.googleSignInContract(webClientId) }
     val context = LocalContext.current
@@ -69,6 +71,7 @@ actual fun SignInCard(settingsScreenModel: SettingsScreenModel) {
 
     pendingSingInConfirmation?.let {
         ConfirmSignInDialog(
+            authManager,
             it.idToken,
             settingsScreenModel,
             onDismissRequest = { pendingSingInConfirmation = null },
@@ -151,11 +154,11 @@ actual fun SignInCard(settingsScreenModel: SettingsScreenModel) {
 
 @Composable
 fun ConfirmSignInDialog(
+    authManager: AuthenticationManager,
     idToken: String,
     screenModel: SettingsScreenModel,
     onDismissRequest: () -> Unit,
 ) {
-    val authManager = LocalAuthenticationManager.current
     val coroutineScope = rememberCoroutineScope()
     val userId = LocalUser.current.id
 

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/DependencyInjection.kt

@@ -172,6 +172,8 @@ val appModule = DI.Module("Common") {
             instance(),
             instance(),
             instance(),
+            instance(),
+            instance(),
         )
     }
     bindFactory { partyId: PartyId -> CharacterPickerScreenModel(partyId, instance()) }
@@ -181,19 +183,27 @@ val appModule = DI.Module("Common") {
         EncounterDetailScreenModel(encounterId, instance(), instance(), instance(), instance())
     }
     bindFactory { characterId: CharacterId ->
-        SkillsScreenModel(characterId, instance(), instance())
+        SkillsScreenModel(characterId, instance(), instance(), instance(), instance())
     }
     bindFactory { characterId: CharacterId ->
-        SpellsScreenModel(characterId, instance(), instance())
+        SpellsScreenModel(characterId, instance(), instance(), instance(), instance())
     }
     bindFactory { characterId: CharacterId ->
-        TalentsScreenModel(characterId, instance(), instance(), instance(), instance())
+        TalentsScreenModel(
+            characterId,
+            instance(),
+            instance(),
+            instance(),
+            instance(),
+            instance(),
+            instance(),
+        )
     }
     bindFactory { characterId: CharacterId ->
-        MiraclesScreenModel(characterId, instance(), instance())
+        MiraclesScreenModel(characterId, instance(), instance(), instance(), instance())
     }
     bindFactory { characterId: CharacterId ->
-        BlessingsScreenModel(characterId, instance(), instance())
+        BlessingsScreenModel(characterId, instance(), instance(), instance(), instance())
     }
 
     bindFactory { partyId: PartyId ->
@@ -220,7 +230,15 @@ val appModule = DI.Module("Common") {
 
     bindSingleton { EffectManager(instance(), instance(), instance()) }
     bindFactory { characterId: CharacterId ->
-        TraitsScreenModel(characterId, instance(), instance(), instance(), instance())
+        TraitsScreenModel(
+            characterId,
+            instance(),
+            instance(),
+            instance(),
+            instance(),
+            instance(),
+            instance(),
+        )
     }
     bindProvider { InvitationScreenModel(instance(), instance(), instance()) }
     bindProvider { PartyListScreenModel(instance()) }
@@ -229,7 +247,9 @@ val appModule = DI.Module("Common") {
         CharacterCreationScreenModel(
             partyId,
             instance(),
-            instance()
+            instance(),
+            instance(),
+            instance(),
         )
     }
     bindFactory { partyId: PartyId ->

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/CharacterDetailScreen.kt

@@ -44,7 +44,6 @@ import cz.frantisekmasa.wfrp_master.common.combat.ActiveCombatBanner
 import cz.frantisekmasa.wfrp_master.common.core.LocalStaticConfiguration
 import cz.frantisekmasa.wfrp_master.common.core.PartyScreenModel
 import cz.frantisekmasa.wfrp_master.common.core.auth.LocalUser
-import cz.frantisekmasa.wfrp_master.common.core.auth.UserId
 import cz.frantisekmasa.wfrp_master.common.core.config.Platform
 import cz.frantisekmasa.wfrp_master.common.core.domain.character.Character
 import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterTab
@@ -142,8 +141,8 @@ data class CharacterDetailScreen(
     ) {
         val characterPickerScreenModel: CharacterPickerScreenModel =
             rememberScreenModel(arg = party.id)
-        val userId = UserId(LocalUser.current.id)
-        val isGameMaster = party.gameMasterId == null || party.gameMasterId == userId.toString()
+        val userId = LocalUser.current.id
+        val isGameMaster = party.gameMasterId == null || party.gameMasterId == userId
         val canAddCharacters = !isGameMaster
 
         val allCharacters = remember {

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/CharacterPickerScreen.kt

@@ -14,7 +14,6 @@ import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import cz.frantisekmasa.wfrp_master.common.characterCreation.CharacterCreationScreen
 import cz.frantisekmasa.wfrp_master.common.core.auth.LocalUser
-import cz.frantisekmasa.wfrp_master.common.core.auth.UserId
 import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterType
 import cz.frantisekmasa.wfrp_master.common.core.domain.identifiers.CharacterId
 import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId
@@ -34,7 +33,7 @@ data class CharacterPickerScreen(
     @Composable
     override fun Content() {
         val screenModel: CharacterPickerScreenModel = rememberScreenModel(arg = partyId)
-        val userId = UserId(LocalUser.current.id)
+        val userId = LocalUser.current.id
 
         val characters = remember { screenModel.allUserCharacters(userId) }
             .collectWithLifecycle(null).value

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/CharacterPickerScreenModel.kt

@@ -16,7 +16,7 @@ class CharacterPickerScreenModel(
     fun allUserCharacters(userId: UserId): Flow<List<Character>> {
         return characters.inParty(partyId, CharacterType.PLAYER_CHARACTER).map {
             it.filter { character ->
-                character.userId == userId.toString() || character.id == userId.toString()
+                character.userId == userId || character.id == userId.toString()
             }
         }
     }