feat: アカウントを切り替えられるようにした

pantasystem · Jul 16, 2023 · 28b30e6 · 28b30e6
1 parent f971aeb
commit 28b30e6
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/modules/common_resource/src/main/res/menu/activity_user_menu.xml b/modules/common_resource/src/main/res/menu/activity_user_menu.xml
@@ -45,4 +45,9 @@
     <item
             android:id="@+id/share"
             android:title="@string/share"/>
+
+    <item
+            android:id="@+id/nav_switch_account"
+            android:title="@string/switch_account"
+        />
 </menu>
diff --git a/...s/features/user/src/main/java/net/pantasystem/milktea/user/activity/UserDetailActivity.kt b/...s/features/user/src/main/java/net/pantasystem/milktea/user/activity/UserDetailActivity.kt
@@ -51,6 +51,7 @@ import net.pantasystem.milktea.user.activity.binder.UserDetailActivityMenuBinder
 import net.pantasystem.milktea.user.databinding.ActivityUserDetailBinding
 import net.pantasystem.milktea.user.nickname.EditNicknameDialog
 import net.pantasystem.milktea.user.profile.ConfirmUserBlockDialog
+import net.pantasystem.milktea.user.profile.ProfileAccountSwitchDialog
 import net.pantasystem.milktea.user.profile.UserProfileFieldListAdapter
 import net.pantasystem.milktea.user.profile.mute.SpecifyMuteExpiredAtDialog
 import net.pantasystem.milktea.user.reaction.UserReactionsFragment
@@ -337,7 +338,6 @@ class UserDetailActivity : AppCompatActivity() {
     }
 
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.activity_user_menu, menu)
 
@@ -412,6 +412,9 @@ class UserDetailActivity : AppCompatActivity() {
                     )
                 )
             }
+            R.id.nav_switch_account -> {
+                ProfileAccountSwitchDialog().show(supportFragmentManager, "switchAccountDialog")
+            }
             else -> return false
 
         }

diff --git a/...features/user/src/main/java/net/pantasystem/milktea/user/viewmodel/UserDetailViewModel.kt b/...features/user/src/main/java/net/pantasystem/milktea/user/viewmodel/UserDetailViewModel.kt
@@ -19,12 +19,15 @@ import net.pantasystem.milktea.common.mapCancellableCatching
 import net.pantasystem.milktea.common.runCancellableCatching
 import net.pantasystem.milktea.common_android.eventbus.EventBus
 import net.pantasystem.milktea.common_android.resource.StringSource
+import net.pantasystem.milktea.common_android_ui.account.viewmodel.AccountViewModelUiStateHelper
 import net.pantasystem.milktea.model.account.Account
 import net.pantasystem.milktea.model.account.AccountRepository
 import net.pantasystem.milktea.model.account.page.Pageable
 import net.pantasystem.milktea.model.account.page.PageableTemplate
+import net.pantasystem.milktea.model.ap.ApResolverService
 import net.pantasystem.milktea.model.instance.FeatureEnables
 import net.pantasystem.milktea.model.instance.FeatureType
+import net.pantasystem.milktea.model.instance.InstanceInfoService
 import net.pantasystem.milktea.model.user.*
 import net.pantasystem.milktea.model.user.block.BlockRepository
 import net.pantasystem.milktea.model.user.mute.CreateMute
@@ -48,9 +51,11 @@ class UserDetailViewModel @Inject constructor(
     private val muteRepository: MuteRepository,
     userDataSource: UserDataSource,
     loggerFactory: Logger.Factory,
+    instanceInfoService: InstanceInfoService,
     private val userRepository: UserRepository,
     private val featureEnables: FeatureEnables,
     private val toggleFollowUseCase: ToggleFollowUseCase,
+    private val apResolverService: ApResolverService,
     private val savedStateHandle: SavedStateHandle,
 ) : ViewModel() {
 
@@ -186,6 +191,14 @@ class UserDetailViewModel @Inject constructor(
         logger.error("ユーザープロフィールのタブの取得に失敗", it)
     }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), emptyList())
 
+    val accountUiState = AccountViewModelUiStateHelper(
+        currentAccount,
+        accountStore,
+        userDataSource,
+        instanceInfoService,
+        viewModelScope,
+    ).uiState
+
     @OptIn(ExperimentalCoroutinesApi::class)
     val renoteMuteState = userState.filterNotNull().flatMapLatest {
         renoteMuteRepository.observeOne(it.id)
@@ -362,6 +375,21 @@ class UserDetailViewModel @Inject constructor(
         }
     }
 
+    fun setCurrentAccount(accountId: Long) {
+        viewModelScope.launch {
+            accountRepository.get(accountId).mapCancellableCatching {
+                it to apResolverService.resolve(getUserId(), accountId).getOrThrow()
+            }.onSuccess { (account, resolved) ->
+                savedStateHandle[UserDetailActivity.EXTRA_USER_ID] = resolved.id.id
+                savedStateHandle[UserDetailActivity.EXTRA_ACCOUNT_ID] = resolved.id.accountId
+                accountStore.setCurrent(account)
+            }.onFailure {
+                logger.error("setCurrentAccount failed", it)
+                _errors.tryEmit(it)
+            }
+        }
+    }
+
     private suspend fun findUser(): User {
         return userRepository.find(getUserId())
     }