Code style

novasamatech · Jan 21, 2025 · f43db62 · f43db62
1 parent 0dc5fdc
commit f43db62
Show file tree

Hide file tree

Showing 18 changed files with 4 additions and 38 deletions.
diff --git a/...gation/navigators/staking/mythos/SelectMythCollatorSettingsInterScreenCommunicatorImpl.kt b/...gation/navigators/staking/mythos/SelectMythCollatorSettingsInterScreenCommunicatorImpl.kt
@@ -6,10 +6,6 @@ import io.novafoundation.nova.app.root.navigation.navigators.NavigationHoldersRe
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollatorSettings.SelectMythCollatorSettingsFragment
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollatorSettings.SelectMythCollatorSettingsInterScreenCommunicator
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollatorSettings.model.MythCollatorRecommendationConfigParcel
-import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.collator.settings.SelectCollatorSettingsFragment
-import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.collator.settings.SelectCollatorSettingsInterScreenCommunicator
-import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.collator.settings.SelectCollatorSettingsInterScreenCommunicator.Request
-import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.collator.settings.SelectCollatorSettingsInterScreenCommunicator.Response
 
 class SelectMythCollatorSettingsInterScreenCommunicatorImpl(navigationHoldersRegistry: NavigationHoldersRegistry) :
     SelectMythCollatorSettingsInterScreenCommunicator,

diff --git a/common/src/main/java/io/novafoundation/nova/common/address/AccountIdParcel.kt b/common/src/main/java/io/novafoundation/nova/common/address/AccountIdParcel.kt
@@ -6,7 +6,7 @@ import io.novasama.substrate_sdk_android.runtime.AccountId
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
-class AccountIdParcel(private val value: AccountId): Parcelable {
+class AccountIdParcel(private val value: AccountId) : Parcelable {
 
     companion object {
 

diff --git a/...l/src/main/java/io/novafoundation/nova/feature_staking_impl/di/StakingFeatureComponent.kt b/...l/src/main/java/io/novafoundation/nova/feature_staking_impl/di/StakingFeatureComponent.kt
@@ -249,7 +249,6 @@ interface StakingFeatureComponent : StakingFeatureApi {
 
     fun selectMythosSettingsFactory(): SelectMythCollatorSettingsComponent.Factory
 
-
     @Component.Factory
     interface Factory {
 

diff --git a/...vafoundation/nova/feature_staking_impl/domain/mythos/common/model/MythosDelegatorState.kt b/...vafoundation/nova/feature_staking_impl/domain/mythos/common/model/MythosDelegatorState.kt
@@ -60,7 +60,7 @@ fun MythosDelegatorState.stakeByCollator(): Map<AccountIdKey, Balance> {
 }
 
 fun MythosDelegatorState.stakedCollatorsCount(): Int {
-    return  when (this) {
+    return when (this) {
         is MythosDelegatorState.Locked.Delegating -> userStakeInfo.candidates.size
         MythosDelegatorState.NotStarted, is MythosDelegatorState.Locked.NotDelegating -> 0
     }

diff --git a/...afoundation/nova/feature_staking_impl/domain/mythos/start/StartMythosStakingInteractor.kt b/...afoundation/nova/feature_staking_impl/domain/mythos/start/StartMythosStakingInteractor.kt
@@ -12,9 +12,7 @@ import io.novafoundation.nova.feature_staking_impl.data.mythos.network.blockchai
 import io.novafoundation.nova.feature_staking_impl.data.mythos.network.blockchain.calls.collatorStaking
 import io.novafoundation.nova.feature_staking_impl.data.mythos.network.blockchain.calls.lock
 import io.novafoundation.nova.feature_staking_impl.data.mythos.network.blockchain.calls.stake
-import io.novafoundation.nova.feature_staking_impl.data.mythos.repository.MythosCandidatesRepository
 import io.novafoundation.nova.feature_staking_impl.data.mythos.repository.MythosStakingRepository
-import io.novafoundation.nova.feature_staking_impl.data.mythos.repository.RealMythosCandidatesRepository
 import io.novafoundation.nova.feature_staking_impl.domain.mythos.common.MythosSharedComputation
 import io.novafoundation.nova.feature_staking_impl.domain.mythos.common.model.MythosDelegatorState
 import io.novafoundation.nova.feature_staking_impl.domain.mythos.common.model.stakeByCollator

diff --git a/...ng_impl/presentation/common/singleSelect/chooseTarget/SingleSelectChooseTargetFragment.kt b/...ng_impl/presentation/common/singleSelect/chooseTarget/SingleSelectChooseTargetFragment.kt
@@ -22,7 +22,8 @@ import kotlinx.android.synthetic.main.fragment_parachain_staking_select_collator
 import kotlinx.android.synthetic.main.fragment_parachain_staking_select_collator.selectCollatorSorting
 import kotlinx.android.synthetic.main.fragment_parachain_staking_select_collator.selectCollatorToolbar
 
-abstract class SingleSelectChooseTargetFragment<T, V : SingleSelectChooseTargetViewModel<T, *>> : BaseFragment<V>(),
+abstract class SingleSelectChooseTargetFragment<T, V : SingleSelectChooseTargetViewModel<T, *>> :
+    BaseFragment<V>(),
     StakeTargetAdapter.ItemHandler<T> {
 
     val adapter by lazy(LazyThreadSafetyMode.NONE) {

diff --git a/...g_impl/presentation/common/singleSelect/chooseTarget/SingleSelectChooseTargetViewModel.kt b/...g_impl/presentation/common/singleSelect/chooseTarget/SingleSelectChooseTargetViewModel.kt
@@ -126,7 +126,6 @@ abstract class SingleSelectChooseTargetViewModel<T, C : SingleSelectRecommendato
         fun scoringHeaderFor(config: C): String
 
         fun recommendationConfigChanges(): Flow<C>
-
     }
 
     private inner class ShownStakeTargets(val targets: List<T>, val usedConfig: C)

diff --git a/...c/main/java/io/novafoundation/nova/feature_staking_impl/presentation/mappers/Validator.kt b/...c/main/java/io/novafoundation/nova/feature_staking_impl/presentation/mappers/Validator.kt
@@ -8,9 +8,7 @@ import io.novafoundation.nova.common.resources.ResourceManager
 import io.novafoundation.nova.common.utils.Fraction
 import io.novafoundation.nova.common.utils.Fraction.Companion.fractions
 import io.novafoundation.nova.common.utils.formatting.format
-import io.novafoundation.nova.common.utils.formatting.formatAsPercentage
 import io.novafoundation.nova.common.utils.formatting.formatPercents
-import io.novafoundation.nova.common.utils.fractionToPercentage
 import io.novafoundation.nova.feature_account_api.presenatation.account.icon.createAccountAddressModel
 import io.novafoundation.nova.feature_currency_api.presentation.formatters.formatAsCurrency
 import io.novafoundation.nova.feature_staking_api.domain.model.NominatedValidator

diff --git a/...ure_staking_impl/presentation/mythos/start/selectCollator/SelectMythosCollatorFragment.kt b/...ure_staking_impl/presentation/mythos/start/selectCollator/SelectMythosCollatorFragment.kt
@@ -4,7 +4,6 @@ import io.novafoundation.nova.common.di.FeatureUtils
 import io.novafoundation.nova.feature_staking_api.di.StakingFeatureApi
 import io.novafoundation.nova.feature_staking_impl.di.StakingFeatureComponent
 import io.novafoundation.nova.feature_staking_impl.domain.mythos.common.model.MythosCollator
-import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.common.model.Collator
 import io.novafoundation.nova.feature_staking_impl.presentation.common.singleSelect.chooseTarget.SingleSelectChooseTargetFragment
 
 class SelectMythosCollatorFragment : SingleSelectChooseTargetFragment<MythosCollator, SelectMythosCollatorViewModel>() {

diff --git a/...staking_impl/presentation/mythos/start/selectCollator/di/SelectMythosCollatorComponent.kt b/...staking_impl/presentation/mythos/start/selectCollator/di/SelectMythosCollatorComponent.kt
@@ -5,7 +5,6 @@ import dagger.BindsInstance
 import dagger.Subcomponent
 import io.novafoundation.nova.common.di.scope.ScreenScope
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollator.SelectMythosCollatorFragment
-import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.collator.select.SelectCollatorFragment
 
 @Subcomponent(
     modules = [

diff --git a/...re_staking_impl/presentation/mythos/start/selectCollator/di/SelectMythosCollatorModule.kt b/...re_staking_impl/presentation/mythos/start/selectCollator/di/SelectMythosCollatorModule.kt
@@ -6,25 +6,16 @@ import androidx.lifecycle.ViewModelProvider
 import dagger.Module
 import dagger.Provides
 import dagger.multibindings.IntoMap
-import io.novafoundation.nova.common.address.AddressIconGenerator
-import io.novafoundation.nova.common.di.modules.Caching
 import io.novafoundation.nova.common.di.viewmodel.ViewModelKey
 import io.novafoundation.nova.common.di.viewmodel.ViewModelModule
 import io.novafoundation.nova.common.resources.ResourceManager
 import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState
 import io.novafoundation.nova.feature_staking_impl.domain.mythos.common.recommendations.MythosCollatorRecommendatorFactory
-import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.common.CollatorsUseCase
-import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.common.recommendations.CollatorRecommendatorFactory
 import io.novafoundation.nova.feature_staking_impl.presentation.MythosStakingRouter
-import io.novafoundation.nova.feature_staking_impl.presentation.ParachainStakingRouter
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.SelectMythosInterScreenCommunicator
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.common.MythosCollatorFormatter
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollator.SelectMythosCollatorViewModel
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollatorSettings.SelectMythCollatorSettingsInterScreenCommunicator
-import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollatorSettings.SelectMythCollatorSettingsInterScreenRequester
-import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.collator.common.SelectCollatorInterScreenCommunicator
-import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.collator.select.SelectCollatorViewModel
-import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.collator.settings.SelectCollatorSettingsInterScreenCommunicator
 import io.novafoundation.nova.feature_wallet_api.domain.TokenUseCase
 
 @Module(includes = [ViewModelModule::class])

diff --git a/...pl/presentation/mythos/start/selectCollatorSettings/SelectMythCollatorSettingsFragment.kt b/...pl/presentation/mythos/start/selectCollatorSettings/SelectMythCollatorSettingsFragment.kt
@@ -14,9 +14,7 @@ import io.novafoundation.nova.feature_staking_api.di.StakingFeatureApi
 import io.novafoundation.nova.feature_staking_impl.R
 import io.novafoundation.nova.feature_staking_impl.di.StakingFeatureComponent
 import io.novafoundation.nova.feature_staking_impl.domain.mythos.common.recommendations.MythosCollatorSorting
-import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollator.SelectMythosCollatorViewModel
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollatorSettings.model.MythCollatorRecommendationConfigParcel
-import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.collator.settings.model.CollatorRecommendationConfigParcelModel
 import kotlinx.android.synthetic.main.fragment_parachain_staking_select_collator_settings.selectCollatorSettingsApply
 import kotlinx.android.synthetic.main.fragment_parachain_staking_select_collator_settings.selectCollatorSettingsSort
 import kotlinx.android.synthetic.main.fragment_parachain_staking_select_collator_settings.selectCollatorSettingsToolbar

diff --git a/...l/presentation/mythos/start/selectCollatorSettings/SelectMythCollatorSettingsViewModel.kt b/...l/presentation/mythos/start/selectCollatorSettings/SelectMythCollatorSettingsViewModel.kt
@@ -4,7 +4,6 @@ import androidx.lifecycle.viewModelScope
 import io.novafoundation.nova.common.base.BaseViewModel
 import io.novafoundation.nova.feature_staking_impl.domain.mythos.common.recommendations.MythosCollatorRecommendationConfig
 import io.novafoundation.nova.feature_staking_impl.presentation.MythosStakingRouter
-import io.novafoundation.nova.feature_staking_impl.presentation.ParachainStakingRouter
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollatorSettings.model.MythCollatorRecommendationConfigParcel
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollatorSettings.model.toDomain
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollatorSettings.model.toParcel

diff --git a/...resentation/mythos/start/selectCollatorSettings/di/SelectMythCollatorSettingsComponent.kt b/...resentation/mythos/start/selectCollatorSettings/di/SelectMythCollatorSettingsComponent.kt
@@ -6,8 +6,6 @@ import dagger.Subcomponent
 import io.novafoundation.nova.common.di.scope.ScreenScope
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollatorSettings.SelectMythCollatorSettingsFragment
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollatorSettings.model.MythCollatorRecommendationConfigParcel
-import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.collator.settings.SelectCollatorSettingsFragment
-import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.collator.settings.model.CollatorRecommendationConfigParcelModel
 
 @Subcomponent(
     modules = [

diff --git a/...l/presentation/mythos/start/selectCollatorSettings/di/SelectMythCollatorSettingsModule.kt b/...l/presentation/mythos/start/selectCollatorSettings/di/SelectMythCollatorSettingsModule.kt
@@ -9,14 +9,9 @@ import dagger.multibindings.IntoMap
 import io.novafoundation.nova.common.di.viewmodel.ViewModelKey
 import io.novafoundation.nova.common.di.viewmodel.ViewModelModule
 import io.novafoundation.nova.feature_staking_impl.presentation.MythosStakingRouter
-import io.novafoundation.nova.feature_staking_impl.presentation.ParachainStakingRouter
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollatorSettings.SelectMythCollatorSettingsInterScreenCommunicator
-import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollatorSettings.SelectMythCollatorSettingsInterScreenResponder
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollatorSettings.SelectMythCollatorSettingsViewModel
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.selectCollatorSettings.model.MythCollatorRecommendationConfigParcel
-import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.collator.settings.SelectCollatorSettingsInterScreenCommunicator
-import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.collator.settings.SelectCollatorSettingsViewModel
-import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.collator.settings.model.CollatorRecommendationConfigParcelModel
 
 @Module(includes = [ViewModelModule::class])
 class SelectMythCollatorSettingsModule {

diff --git a/.../feature_staking_impl/presentation/mythos/start/setup/SetupStartMythosStakingViewModel.kt b/.../feature_staking_impl/presentation/mythos/start/setup/SetupStartMythosStakingViewModel.kt
@@ -37,7 +37,6 @@ import io.novafoundation.nova.feature_wallet_api.presentation.mixin.amountChoose
 import io.novafoundation.nova.feature_wallet_api.presentation.mixin.fee.FeeLoaderMixin
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import java.math.BigDecimal

diff --git a/.../feature_staking_impl/presentation/mythos/start/setup/di/SetupStartMythosStakingModule.kt b/.../feature_staking_impl/presentation/mythos/start/setup/di/SetupStartMythosStakingModule.kt
@@ -18,7 +18,6 @@ import io.novafoundation.nova.feature_staking_impl.domain.mythos.common.recommen
 import io.novafoundation.nova.feature_staking_impl.domain.mythos.start.StartMythosStakingInteractor
 import io.novafoundation.nova.feature_staking_impl.presentation.MythosStakingRouter
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.SelectMythosInterScreenCommunicator
-import io.novafoundation.nova.feature_staking_impl.presentation.mythos.SelectMythosInterScreenRequester
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.common.MythosCollatorFormatter
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.setup.SetupStartMythosStakingViewModel
 import io.novafoundation.nova.feature_staking_impl.presentation.mythos.start.setup.rewards.MythosStakingRewardsComponentFactory

diff --git a/...dation/nova/feature_staking_impl/presentation/parachainStaking/common/mappers/Collator.kt b/...dation/nova/feature_staking_impl/presentation/parachainStaking/common/mappers/Collator.kt
@@ -19,9 +19,7 @@ import io.novafoundation.nova.feature_staking_impl.presentation.validators.parce
 import io.novafoundation.nova.feature_staking_impl.presentation.validators.parcel.StakerParcelModel
 import io.novafoundation.nova.feature_wallet_api.domain.model.Token
 import io.novafoundation.nova.feature_wallet_api.presentation.model.mapAmountToAmountModel
-import io.novafoundation.nova.runtime.ext.addressOf
 import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain
-import io.novasama.substrate_sdk_android.extensions.fromHex
 
 typealias CollatorModel = StakeTargetModel<Collator>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -249,7 +249,6 @@ interface StakingFeatureComponent : StakingFeatureApi {

		fun selectMythosSettingsFactory(): SelectMythCollatorSettingsComponent.Factory


		@Component.Factory
		interface Factory {

Expand Down
-Original file line number
+Diff line change
@@ Expand Up @@
             fun scoringHeaderFor(config: C): String
             fun recommendationConfigChanges(): Flow<C>
         }
         private inner class ShownStakeTargets(val targets: List<T>, val usedConfig: C)
@@ Expand Down @@