Skip to content

Commit 2d55eaa

Browse files
PururunPururun
committed
Fix konsist issues
1 parent ab7229d commit 2d55eaa

File tree

11 files changed

+89
-94
lines changed

11 files changed

+89
-94
lines changed

‎android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/CreateCustomListDialogTest.kt

+11-11
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class CreateCustomListDialogTest {
3333
composeExtension.use {
3434
// Arrange
3535
val uiState = CreateCustomListUiState(error = null)
36-
setContentWithTheme { CreateCustomListDialog(uiState = uiState) }
36+
setContentWithTheme { CreateCustomListDialog(state = uiState) }
3737

3838
// Assert
3939
onNodeWithText(NAME_EXIST_ERROR_TEXT).assertDoesNotExist()
@@ -44,8 +44,8 @@ class CreateCustomListDialogTest {
4444
fun givenCustomListExistsShouldShowCustomListExitsErrorText() =
4545
composeExtension.use {
4646
// Arrange
47-
val uiState = CreateCustomListUiState(error = CustomListsError.CustomListExists)
48-
setContentWithTheme { CreateCustomListDialog(uiState = uiState) }
47+
val state = CreateCustomListUiState(error = CustomListsError.CustomListExists)
48+
setContentWithTheme { CreateCustomListDialog(state = state) }
4949

5050
// Assert
5151
onNodeWithText(NAME_EXIST_ERROR_TEXT).assertExists()
@@ -57,7 +57,7 @@ class CreateCustomListDialogTest {
5757
composeExtension.use {
5858
// Arrange
5959
val uiState = CreateCustomListUiState(error = CustomListsError.OtherError)
60-
setContentWithTheme { CreateCustomListDialog(uiState = uiState) }
60+
setContentWithTheme { CreateCustomListDialog(state = uiState) }
6161

6262
// Assert
6363
onNodeWithText(NAME_EXIST_ERROR_TEXT).assertDoesNotExist()
@@ -71,7 +71,7 @@ class CreateCustomListDialogTest {
7171
val mockedOnDismiss: () -> Unit = mockk(relaxed = true)
7272
val uiState = CreateCustomListUiState()
7373
setContentWithTheme {
74-
CreateCustomListDialog(uiState = uiState, onDismiss = mockedOnDismiss)
74+
CreateCustomListDialog(state = uiState, onDismiss = mockedOnDismiss)
7575
}
7676

7777
// Act
@@ -86,9 +86,9 @@ class CreateCustomListDialogTest {
8686
composeExtension.use {
8787
// Arrange
8888
val mockedCreateCustomList: (String) -> Unit = mockk(relaxed = true)
89-
val uiState = CreateCustomListUiState()
89+
val state = CreateCustomListUiState()
9090
setContentWithTheme {
91-
CreateCustomListDialog(uiState = uiState, createCustomList = mockedCreateCustomList)
91+
CreateCustomListDialog(state = state, createCustomList = mockedCreateCustomList)
9292
}
9393

9494
// Act
@@ -104,9 +104,9 @@ class CreateCustomListDialogTest {
104104
// Arrange
105105
val mockedCreateCustomList: (String) -> Unit = mockk(relaxed = true)
106106
val inputText = "NEW LIST"
107-
val uiState = CreateCustomListUiState()
107+
val state = CreateCustomListUiState()
108108
setContentWithTheme {
109-
CreateCustomListDialog(uiState = uiState, createCustomList = mockedCreateCustomList)
109+
CreateCustomListDialog(state = state, createCustomList = mockedCreateCustomList)
110110
}
111111

112112
// Act
@@ -123,9 +123,9 @@ class CreateCustomListDialogTest {
123123
// Arrange
124124
val mockedOnInputChanged: () -> Unit = mockk(relaxed = true)
125125
val inputText = "NEW LIST"
126-
val uiState = CreateCustomListUiState()
126+
val state = CreateCustomListUiState()
127127
setContentWithTheme {
128-
CreateCustomListDialog(uiState = uiState, onInputChanged = mockedOnInputChanged)
128+
CreateCustomListDialog(state = state, onInputChanged = mockedOnInputChanged)
129129
}
130130

131131
// Act

‎android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/EditCustomListNameDialogTest.kt

+13-13
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ class EditCustomListNameDialogTest {
3232
fun givenNoErrorShouldShowNoErrorMessage() =
3333
composeExtension.use {
3434
// Arrange
35-
val uiState = UpdateCustomListUiState(error = null)
36-
setContentWithTheme { EditCustomListNameDialog(uiState = uiState) }
35+
val state = UpdateCustomListUiState(error = null)
36+
setContentWithTheme { EditCustomListNameDialog(state = state) }
3737

3838
// Assert
3939
onNodeWithText(NAME_EXIST_ERROR_TEXT).assertDoesNotExist()
@@ -44,8 +44,8 @@ class EditCustomListNameDialogTest {
4444
fun givenCustomListExistsShouldShowCustomListExitsErrorText() =
4545
composeExtension.use {
4646
// Arrange
47-
val uiState = UpdateCustomListUiState(error = CustomListsError.CustomListExists)
48-
setContentWithTheme { EditCustomListNameDialog(uiState = uiState) }
47+
val state = UpdateCustomListUiState(error = CustomListsError.CustomListExists)
48+
setContentWithTheme { EditCustomListNameDialog(state = state) }
4949

5050
// Assert
5151
onNodeWithText(NAME_EXIST_ERROR_TEXT).assertExists()
@@ -56,8 +56,8 @@ class EditCustomListNameDialogTest {
5656
fun givenOtherCustomListErrorShouldShowAnErrorOccurredErrorText() =
5757
composeExtension.use {
5858
// Arrange
59-
val uiState = UpdateCustomListUiState(error = CustomListsError.OtherError)
60-
setContentWithTheme { EditCustomListNameDialog(uiState = uiState) }
59+
val state = UpdateCustomListUiState(error = CustomListsError.OtherError)
60+
setContentWithTheme { EditCustomListNameDialog(state = state) }
6161

6262
// Assert
6363
onNodeWithText(NAME_EXIST_ERROR_TEXT).assertDoesNotExist()
@@ -69,9 +69,9 @@ class EditCustomListNameDialogTest {
6969
composeExtension.use {
7070
// Arrange
7171
val mockedOnDismiss: () -> Unit = mockk(relaxed = true)
72-
val uiState = UpdateCustomListUiState()
72+
val state = UpdateCustomListUiState()
7373
setContentWithTheme {
74-
EditCustomListNameDialog(uiState = uiState, onDismiss = mockedOnDismiss)
74+
EditCustomListNameDialog(state = state, onDismiss = mockedOnDismiss)
7575
}
7676

7777
// Act
@@ -86,9 +86,9 @@ class EditCustomListNameDialogTest {
8686
composeExtension.use {
8787
// Arrange
8888
val mockedUpdateName: (String) -> Unit = mockk(relaxed = true)
89-
val uiState = UpdateCustomListUiState()
89+
val state = UpdateCustomListUiState()
9090
setContentWithTheme {
91-
EditCustomListNameDialog(uiState = uiState, updateName = mockedUpdateName)
91+
EditCustomListNameDialog(state = state, updateName = mockedUpdateName)
9292
}
9393

9494
// Act
@@ -106,7 +106,7 @@ class EditCustomListNameDialogTest {
106106
val inputText = "NEW NAME"
107107
val uiState = UpdateCustomListUiState()
108108
setContentWithTheme {
109-
EditCustomListNameDialog(uiState = uiState, updateName = mockedUpdateName)
109+
EditCustomListNameDialog(state = state, updateName = mockedUpdateName)
110110
}
111111

112112
// Act
@@ -123,9 +123,9 @@ class EditCustomListNameDialogTest {
123123
// Arrange
124124
val mockedOnInputChanged: () -> Unit = mockk(relaxed = true)
125125
val inputText = "NEW NAME"
126-
val uiState = UpdateCustomListUiState()
126+
val state = UpdateCustomListUiState()
127127
setContentWithTheme {
128-
EditCustomListNameDialog(uiState = uiState, onInputChanged = mockedOnInputChanged)
128+
EditCustomListNameDialog(state = state, onInputChanged = mockedOnInputChanged)
129129
}
130130

131131
// Act

‎android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListLocationsScreenTest.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class CustomListLocationsScreenTest {
3434
// Arrange
3535
setContentWithTheme {
3636
CustomListLocationsScreen(
37-
uiState = CustomListLocationsUiState.Loading(newList = false)
37+
state = CustomListLocationsUiState.Loading(newList = false)
3838
)
3939
}
4040

@@ -49,7 +49,7 @@ class CustomListLocationsScreenTest {
4949
val newList = true
5050
setContentWithTheme {
5151
CustomListLocationsScreen(
52-
uiState = CustomListLocationsUiState.Loading(newList = newList)
52+
state = CustomListLocationsUiState.Loading(newList = newList)
5353
)
5454
}
5555

@@ -64,7 +64,7 @@ class CustomListLocationsScreenTest {
6464
val newList = false
6565
setContentWithTheme {
6666
CustomListLocationsScreen(
67-
uiState = CustomListLocationsUiState.Loading(newList = newList)
67+
state = CustomListLocationsUiState.Loading(newList = newList)
6868
)
6969
}
7070

@@ -78,7 +78,7 @@ class CustomListLocationsScreenTest {
7878
// Arrange
7979
setContentWithTheme {
8080
CustomListLocationsScreen(
81-
uiState =
81+
state =
8282
CustomListLocationsUiState.Content.Data(
8383
availableLocations = DUMMY_RELAY_COUNTRIES,
8484
selectedLocations = emptySet(),
@@ -104,7 +104,7 @@ class CustomListLocationsScreenTest {
104104
val mockedOnRelaySelectionClicked: (RelayItem, Boolean) -> Unit = mockk(relaxed = true)
105105
setContentWithTheme {
106106
CustomListLocationsScreen(
107-
uiState =
107+
state =
108108
CustomListLocationsUiState.Content.Data(
109109
newList = false,
110110
availableLocations = DUMMY_RELAY_COUNTRIES,
@@ -128,7 +128,7 @@ class CustomListLocationsScreenTest {
128128
val mockedSearchTermInput: (String) -> Unit = mockk(relaxed = true)
129129
setContentWithTheme {
130130
CustomListLocationsScreen(
131-
uiState =
131+
state =
132132
CustomListLocationsUiState.Content.Data(
133133
newList = false,
134134
availableLocations = DUMMY_RELAY_COUNTRIES,
@@ -153,7 +153,7 @@ class CustomListLocationsScreenTest {
153153
val mockSearchString = "SEARCH"
154154
setContentWithTheme {
155155
CustomListLocationsScreen(
156-
uiState =
156+
state =
157157
CustomListLocationsUiState.Content.Empty(
158158
newList = false,
159159
searchTerm = mockSearchString
@@ -175,7 +175,7 @@ class CustomListLocationsScreenTest {
175175
val emptySearchString = ""
176176
setContentWithTheme {
177177
CustomListLocationsScreen(
178-
uiState =
178+
state =
179179
CustomListLocationsUiState.Content.Empty(
180180
newList = false,
181181
searchTerm = emptySearchString
@@ -194,7 +194,7 @@ class CustomListLocationsScreenTest {
194194
val mockOnSaveClick: () -> Unit = mockk(relaxed = true)
195195
setContentWithTheme {
196196
CustomListLocationsScreen(
197-
uiState =
197+
state =
198198
CustomListLocationsUiState.Content.Data(
199199
newList = false,
200200
availableLocations = DUMMY_RELAY_COUNTRIES,
@@ -218,7 +218,7 @@ class CustomListLocationsScreenTest {
218218
val mockOnSaveClick: () -> Unit = mockk(relaxed = true)
219219
setContentWithTheme {
220220
CustomListLocationsScreen(
221-
uiState =
221+
state =
222222
CustomListLocationsUiState.Content.Data(
223223
newList = false,
224224
availableLocations = DUMMY_RELAY_COUNTRIES,

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DropdownMenuCell.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import net.mullvad.mullvadvpn.lib.theme.Dimens
1818

1919
@Preview
2020
@Composable
21-
fun PreviewThreeDotCell() {
21+
private fun PreviewThreeDotCell() {
2222
AppTheme {
2323
ThreeDotCell(
2424
text = "Three dots",

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/IconCell.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import net.mullvad.mullvadvpn.lib.theme.Dimens
1818

1919
@Preview
2020
@Composable
21-
fun PreviewIconCell() {
21+
private fun PreviewIconCell() {
2222
AppTheme { IconCell(iconId = R.drawable.icon_add, title = "Add") }
2323
}
2424

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/TwoRowCell.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import net.mullvad.mullvadvpn.lib.theme.Dimens
1313

1414
@Preview
1515
@Composable
16-
fun PreviewTwoRowCell() {
16+
private fun PreviewTwoRowCell() {
1717
AppTheme { TwoRowCell(titleText = "Title", subtitleText = "Subtitle") }
1818
}
1919

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CreateCustomListDialog.kt

+11-11
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import androidx.compose.material3.MaterialTheme
66
import androidx.compose.material3.Text
77
import androidx.compose.runtime.Composable
88
import androidx.compose.runtime.LaunchedEffect
9-
import androidx.compose.runtime.collectAsState
109
import androidx.compose.runtime.derivedStateOf
1110
import androidx.compose.runtime.getValue
1211
import androidx.compose.runtime.mutableStateOf
@@ -20,6 +19,7 @@ import androidx.compose.ui.platform.testTag
2019
import androidx.compose.ui.res.stringResource
2120
import androidx.compose.ui.text.input.KeyboardType
2221
import androidx.compose.ui.tooling.preview.Preview
22+
import androidx.lifecycle.compose.collectAsStateWithLifecycle
2323
import com.ramcosta.composedestinations.annotation.Destination
2424
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
2525
import com.ramcosta.composedestinations.result.ResultBackNavigator
@@ -40,16 +40,16 @@ import org.koin.core.parameter.parametersOf
4040

4141
@Preview
4242
@Composable
43-
fun PreviewCreateCustomListDialog() {
44-
AppTheme { CreateCustomListDialog(uiState = CreateCustomListUiState()) }
43+
private fun PreviewCreateCustomListDialog() {
44+
AppTheme { CreateCustomListDialog(state = CreateCustomListUiState()) }
4545
}
4646

4747
@Preview
4848
@Composable
49-
fun PreviewCreateCustomListDialogError() {
49+
private fun PreviewCreateCustomListDialogError() {
5050
AppTheme {
5151
CreateCustomListDialog(
52-
uiState = CreateCustomListUiState(error = CustomListsError.CustomListExists)
52+
state = CreateCustomListUiState(error = CustomListsError.CustomListExists)
5353
)
5454
}
5555
}
@@ -82,9 +82,9 @@ fun CreateCustomList(
8282
}
8383
}
8484
}
85-
val uiState = vm.uiState.collectAsState().value
85+
val state by vm.uiState.collectAsStateWithLifecycle()
8686
CreateCustomListDialog(
87-
uiState = uiState,
87+
state = state,
8888
createCustomList = vm::createCustomList,
8989
onInputChanged = vm::clearError,
9090
onDismiss = backNavigator::navigateBack
@@ -93,7 +93,7 @@ fun CreateCustomList(
9393

9494
@Composable
9595
fun CreateCustomListDialog(
96-
uiState: CreateCustomListUiState,
96+
state: CreateCustomListUiState,
9797
createCustomList: (String) -> Unit = {},
9898
onInputChanged: () -> Unit = {},
9999
onDismiss: () -> Unit = {}
@@ -124,12 +124,12 @@ fun CreateCustomListDialog(
124124
},
125125
keyboardType = KeyboardType.Text,
126126
placeholderText = "",
127-
isValidValue = uiState.error == null,
127+
isValidValue = state.error == null,
128128
isDigitsOnlyAllowed = false,
129129
supportingText = {
130-
if (uiState.error != null) {
130+
if (state.error != null) {
131131
Text(
132-
text = uiState.error.errorString(),
132+
text = state.error.errorString(),
133133
color = MaterialTheme.colorScheme.error,
134134
style = MaterialTheme.typography.bodySmall
135135
)

0 commit comments

Comments
 (0)