Skip to content

Commit d4f37f0

Browse files
committed
chore(flipcash): convert other instances of BottomBarMessage to use actions builder
Signed-off-by: Brandon McAnsh <git@bmcreations.dev>
1 parent 7d52999 commit d4f37f0

2 files changed

Lines changed: 29 additions & 14 deletions

File tree

apps/flipcash/features/login/src/main/kotlin/com/flipcash/app/login/accesskey/AccessKeyScreen.kt

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ import cafe.adriel.voyager.hilt.getViewModel
5050
import com.flipcash.app.core.NavScreenProvider
5151
import com.flipcash.app.core.android.extensions.launchAppSettings
5252
import com.flipcash.features.login.R
53+
import com.getcode.manager.BottomBarAction
5354
import com.getcode.manager.BottomBarManager
5455
import com.getcode.manager.TopBarManager
5556
import com.getcode.navigation.core.LocalCodeNavigator
@@ -220,12 +221,16 @@ internal fun AccessKeyScreenContent(viewModel: LoginAccessKeyViewModel, onComple
220221
subtitle = context
221222
.getString(R.string.prompt_description_wroteThemDown),
222223
showScrim = true,
223-
positiveText = context
224-
.getString(R.string.action_yesWroteThemDown),
225-
negativeText = "",
226-
tertiaryText = context.getString(R.string.action_cancel),
227-
onPositive = { onSkipClick() },
228-
onNegative = {}
224+
showCancel = true,
225+
actions = listOf(
226+
BottomBarAction(
227+
text = context
228+
.getString(R.string.action_wroteThemDownInstead)
229+
) {
230+
onSkipClick()
231+
232+
}
233+
)
229234
)
230235
)
231236
},
@@ -300,12 +305,17 @@ internal fun AccessKeyScreenContent(viewModel: LoginAccessKeyViewModel, onComple
300305
subtitle = context
301306
.getString(R.string.prompt_description_exitAccountCreation),
302307
showScrim = true,
303-
positiveText = context.getString(R.string.action_exit),
304-
negativeText = "",
305-
tertiaryText = context.getString(R.string.action_cancel),
306-
onPositive = { navigator.replaceAll(ScreenRegistry.get(NavScreenProvider.Login.Home())) },
308+
showCancel = true,
309+
actions = listOf(
310+
BottomBarAction(
311+
text = context
312+
.getString(R.string.action_exit)
313+
) {
314+
navigator.replaceAll(ScreenRegistry.get(NavScreenProvider.Login.Home()))
315+
316+
}
317+
),
307318
type = BottomBarManager.BottomBarMessageType.DESTRUCTIVE,
308-
onNegative = {}
309319
)
310320
)
311321
}

apps/flipcash/features/myaccount/src/main/kotlin/com/flipcash/app/myaccount/internal/MyAccountScreenViewModel.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import com.flipcash.app.featureflags.FeatureFlagController
88
import com.flipcash.app.menu.MenuItem
99
import com.flipcash.features.myaccount.R
1010
import com.flipcash.services.user.UserManager
11+
import com.getcode.manager.BottomBarAction
1112
import com.getcode.manager.BottomBarManager
1213
import com.getcode.manager.TopBarManager
1314
import com.getcode.solana.keys.base58
@@ -168,9 +169,13 @@ internal class MyAccountScreenViewModel @Inject constructor(
168169
title = resources.getString(R.string.prompt_title_viewAccessKey),
169170
subtitle = resources.getString(R.string.prompt_description_viewAccessKey),
170171
showScrim = true,
171-
positiveText = resources.getString(R.string.action_viewAccessKey),
172-
negativeText = resources.getString(R.string.action_cancel),
173-
onPositive = { dispatchEvent(Event.OnViewAccessKey) },
172+
showCancel = true,
173+
actions = listOf(
174+
BottomBarAction(
175+
text = resources.getString(R.string.action_viewAccessKey),
176+
onClick = { dispatchEvent(Event.OnViewAccessKey) }
177+
)
178+
),
174179
)
175180
)
176181
}.launchIn(viewModelScope)

0 commit comments

Comments
 (0)