Skip to content

Commit 55d3d3f

Browse files
committed
BREAKING: Renames BackStackConfig.Other to CanGoBack
Just trying to make it easier to understand.
1 parent c4f52b1 commit 55d3d3f

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

samples/containers/poetry/src/main/java/com/squareup/sample/poetry/StanzaListScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import com.squareup.workflow1.ui.ScreenViewRunner
1717
import com.squareup.workflow1.ui.ViewEnvironment
1818
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
1919
import com.squareup.workflow1.ui.navigation.BackStackConfig
20-
import com.squareup.workflow1.ui.navigation.BackStackConfig.Other
20+
import com.squareup.workflow1.ui.navigation.BackStackConfig.CanGoBack
2121
import com.squareup.workflow1.ui.navigation.setBackHandler
2222

2323
@OptIn(WorkflowUiExperimentalApi::class)
@@ -53,7 +53,7 @@ private class StanzaListLayoutRunner(view: View) : ScreenViewRunner<StanzaListSc
5353
toolbar.title = rendering.title
5454
toolbar.subtitle = rendering.subtitle
5555

56-
if (environment[BackStackConfig] == Other) {
56+
if (environment[BackStackConfig] == CanGoBack) {
5757
toolbar.setNavigationOnClickListener { rendering.onExit() }
5858
toolbar.setBackHandler(rendering.onExit)
5959
} else {

samples/todo-android/app/src/main/java/com/squareup/sample/todo/TodoEditorScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import com.squareup.workflow1.ui.ViewEnvironment
1414
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
1515
import com.squareup.workflow1.ui.control
1616
import com.squareup.workflow1.ui.navigation.BackStackConfig
17-
import com.squareup.workflow1.ui.navigation.BackStackConfig.Other
17+
import com.squareup.workflow1.ui.navigation.BackStackConfig.CanGoBack
1818
import com.squareup.workflow1.ui.navigation.setBackHandler
1919

2020
@OptIn(WorkflowUiExperimentalApi::class)
@@ -60,7 +60,7 @@ private class Runner(
6060
rendering.session.title.control(todoTitle)
6161
itemListView.setRows(rendering.session.rows)
6262

63-
if (environment[BackStackConfig] == Other) {
63+
if (environment[BackStackConfig] == CanGoBack) {
6464
todoEditorToolbar.setNavigationOnClickListener { rendering.onGoBackClicked() }
6565
root.setBackHandler(rendering.onGoBackClicked)
6666
} else {

workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/navigation/BackStackContainer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import com.squareup.workflow1.ui.androidx.WorkflowAndroidXSupport.stateRegistryO
2828
import com.squareup.workflow1.ui.androidx.WorkflowLifecycleOwner
2929
import com.squareup.workflow1.ui.canShow
3030
import com.squareup.workflow1.ui.compatible
31+
import com.squareup.workflow1.ui.navigation.BackStackConfig.CanGoBack
3132
import com.squareup.workflow1.ui.navigation.BackStackConfig.First
32-
import com.squareup.workflow1.ui.navigation.BackStackConfig.Other
3333
import com.squareup.workflow1.ui.screen
3434
import com.squareup.workflow1.ui.show
3535
import com.squareup.workflow1.ui.startShowing
@@ -71,7 +71,7 @@ public open class BackStackContainer @JvmOverloads constructor(
7171
) {
7272
savedStateParentKey = keyFor(screen)
7373

74-
val config = if (newRendering.backStack.isEmpty()) First else Other
74+
val config = if (newRendering.backStack.isEmpty()) First else CanGoBack
7575
val environment = newViewEnvironment + config
7676

7777
val named: BackStackScreen<NamedScreen<*>> = newRendering

workflow-ui/core-common/api/core-common.api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,10 @@ public final class com/squareup/workflow1/ui/navigation/AlertOverlay$Event$Cance
191191
}
192192

193193
public final class com/squareup/workflow1/ui/navigation/BackStackConfig : java/lang/Enum {
194+
public static final field CanGoBack Lcom/squareup/workflow1/ui/navigation/BackStackConfig;
194195
public static final field Companion Lcom/squareup/workflow1/ui/navigation/BackStackConfig$Companion;
195196
public static final field First Lcom/squareup/workflow1/ui/navigation/BackStackConfig;
196197
public static final field None Lcom/squareup/workflow1/ui/navigation/BackStackConfig;
197-
public static final field Other Lcom/squareup/workflow1/ui/navigation/BackStackConfig;
198198
public static fun getEntries ()Lkotlin/enums/EnumEntries;
199199
public static fun valueOf (Ljava/lang/String;)Lcom/squareup/workflow1/ui/navigation/BackStackConfig;
200200
public static fun values ()[Lcom/squareup/workflow1/ui/navigation/BackStackConfig;

workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/navigation/BackStackConfig.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package com.squareup.workflow1.ui.navigation
33
import com.squareup.workflow1.ui.ViewEnvironment
44
import com.squareup.workflow1.ui.ViewEnvironmentKey
55
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
6-
import com.squareup.workflow1.ui.navigation.BackStackConfig.First
7-
import com.squareup.workflow1.ui.navigation.BackStackConfig.Other
86

97
/**
108
* Informs views whether they're children of a [BackStackScreen],
11-
* and if so whether they're the [first frame][First] or [not][Other].
9+
* and if so whether they're the
10+
* [first frame][com.squareup.workflow1.ui.navigation.BackStackConfig.First]
11+
* or [not][com.squareup.workflow1.ui.navigation.BackStackConfig.CanGoBack].
1212
*/
1313
@WorkflowUiExperimentalApi
1414
public enum class BackStackConfig {
@@ -27,7 +27,7 @@ public enum class BackStackConfig {
2727
* This rendering is in a [BackStackScreen] but is not the first frame.
2828
* Useful as a hint to enable "go back" behavior.
2929
*/
30-
Other;
30+
CanGoBack;
3131

3232
public companion object : ViewEnvironmentKey<BackStackConfig>() {
3333
override val default: BackStackConfig = None

0 commit comments

Comments
 (0)