Skip to content

Commit 8e993df

Browse files
albin-mullvadalbin-mullvad
committed
Merge branch 'start-using-collectasstatewithlifecycle-droid-563'
2 parents 436a14d + ca56675 commit 8e993df

32 files changed

+416
-387
lines changed

‎android/app/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ dependencies {
332332
implementation(Dependencies.AndroidX.coreKtx)
333333
implementation(Dependencies.AndroidX.lifecycleRuntimeKtx)
334334
implementation(Dependencies.AndroidX.lifecycleViewmodelKtx)
335+
implementation(Dependencies.AndroidX.lifecycleRuntimeCompose)
335336
implementation(Dependencies.Compose.constrainLayout)
336337
implementation(Dependencies.Compose.foundation)
337338
implementation(Dependencies.Compose.material3)

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class AccountScreenTest {
4141
// Arrange
4242
setContentWithTheme {
4343
AccountScreen(
44-
uiState =
44+
state =
4545
AccountUiState(
4646
deviceName = DUMMY_DEVICE_NAME,
4747
accountNumber = DUMMY_ACCOUNT_NUMBER,
@@ -65,7 +65,7 @@ class AccountScreenTest {
6565
val mockedClickHandler: () -> Unit = mockk(relaxed = true)
6666
setContentWithTheme {
6767
AccountScreen(
68-
uiState =
68+
state =
6969
AccountUiState(
7070
showSitePayment = true,
7171
deviceName = DUMMY_DEVICE_NAME,
@@ -92,7 +92,7 @@ class AccountScreenTest {
9292
val mockedClickHandler: () -> Unit = mockk(relaxed = true)
9393
setContentWithTheme {
9494
AccountScreen(
95-
uiState =
95+
state =
9696
AccountUiState(
9797
deviceName = DUMMY_DEVICE_NAME,
9898
accountNumber = DUMMY_ACCOUNT_NUMBER,
@@ -119,7 +119,7 @@ class AccountScreenTest {
119119
val mockedClickHandler: () -> Unit = mockk(relaxed = true)
120120
setContentWithTheme {
121121
AccountScreen(
122-
uiState =
122+
state =
123123
AccountUiState(
124124
deviceName = DUMMY_DEVICE_NAME,
125125
accountNumber = DUMMY_ACCOUNT_NUMBER,
@@ -145,7 +145,7 @@ class AccountScreenTest {
145145
// Arrange
146146
setContentWithTheme {
147147
AccountScreen(
148-
uiState =
148+
state =
149149
AccountUiState.default()
150150
.copy(billingPaymentState = PaymentState.Error.Billing),
151151
uiSideEffect =
@@ -166,7 +166,7 @@ class AccountScreenTest {
166166
every { mockPaymentProduct.status } returns null
167167
setContentWithTheme {
168168
AccountScreen(
169-
uiState =
169+
state =
170170
AccountUiState.default()
171171
.copy(
172172
billingPaymentState =
@@ -190,7 +190,7 @@ class AccountScreenTest {
190190
every { mockPaymentProduct.status } returns PaymentStatus.PENDING
191191
setContentWithTheme {
192192
AccountScreen(
193-
uiState =
193+
state =
194194
AccountUiState.default()
195195
.copy(
196196
billingPaymentState =
@@ -215,7 +215,7 @@ class AccountScreenTest {
215215
val mockNavigateToVerificationPending: () -> Unit = mockk(relaxed = true)
216216
setContentWithTheme {
217217
AccountScreen(
218-
uiState =
218+
state =
219219
AccountUiState.default()
220220
.copy(
221221
billingPaymentState =
@@ -243,7 +243,7 @@ class AccountScreenTest {
243243
every { mockPaymentProduct.status } returns PaymentStatus.VERIFICATION_IN_PROGRESS
244244
setContentWithTheme {
245245
AccountScreen(
246-
uiState =
246+
state =
247247
AccountUiState.default()
248248
.copy(
249249
billingPaymentState =
@@ -269,7 +269,7 @@ class AccountScreenTest {
269269
every { mockPaymentProduct.status } returns null
270270
setContentWithTheme {
271271
AccountScreen(
272-
uiState =
272+
state =
273273
AccountUiState.default()
274274
.copy(
275275
billingPaymentState =

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

+23-26
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class ConnectScreenTest {
5858
// Arrange
5959
setContentWithTheme {
6060
ConnectScreen(
61-
uiState = ConnectUiState.INITIAL,
61+
state = ConnectUiState.INITIAL,
6262
)
6363
}
6464

@@ -75,7 +75,7 @@ class ConnectScreenTest {
7575
// Arrange
7676
setContentWithTheme {
7777
ConnectScreen(
78-
uiState =
78+
state =
7979
ConnectUiState(
8080
location = null,
8181
selectedRelayItem = null,
@@ -109,7 +109,7 @@ class ConnectScreenTest {
109109
every { mockTunnelEndpoint.quantumResistant } returns true
110110
setContentWithTheme {
111111
ConnectScreen(
112-
uiState =
112+
state =
113113
ConnectUiState(
114114
location = null,
115115
selectedRelayItem = null,
@@ -144,7 +144,7 @@ class ConnectScreenTest {
144144
val mockTunnelEndpoint: TunnelEndpoint = mockk(relaxed = true)
145145
setContentWithTheme {
146146
ConnectScreen(
147-
uiState =
147+
state =
148148
ConnectUiState(
149149
location = null,
150150
selectedRelayItem = null,
@@ -176,7 +176,7 @@ class ConnectScreenTest {
176176
every { mockTunnelEndpoint.quantumResistant } returns true
177177
setContentWithTheme {
178178
ConnectScreen(
179-
uiState =
179+
state =
180180
ConnectUiState(
181181
location = null,
182182
selectedRelayItem = null,
@@ -209,7 +209,7 @@ class ConnectScreenTest {
209209
every { mockSelectedLocation.locationName } returns mockLocationName
210210
setContentWithTheme {
211211
ConnectScreen(
212-
uiState =
212+
state =
213213
ConnectUiState(
214214
location = null,
215215
selectedRelayItem = mockSelectedLocation,
@@ -244,7 +244,7 @@ class ConnectScreenTest {
244244
every { mockSelectedLocation.locationName } returns mockLocationName
245245
setContentWithTheme {
246246
ConnectScreen(
247-
uiState =
247+
state =
248248
ConnectUiState(
249249
location = null,
250250
selectedRelayItem = mockSelectedLocation,
@@ -277,7 +277,7 @@ class ConnectScreenTest {
277277
every { mockSelectedLocation.locationName } returns mockLocationName
278278
setContentWithTheme {
279279
ConnectScreen(
280-
uiState =
280+
state =
281281
ConnectUiState(
282282
location = null,
283283
selectedRelayItem = mockSelectedLocation,
@@ -320,7 +320,7 @@ class ConnectScreenTest {
320320
every { mockSelectedLocation.locationName } returns mockLocationName
321321
setContentWithTheme {
322322
ConnectScreen(
323-
uiState =
323+
state =
324324
ConnectUiState(
325325
location = null,
326326
selectedRelayItem = mockSelectedLocation,
@@ -361,7 +361,7 @@ class ConnectScreenTest {
361361
// Arrange
362362
setContentWithTheme {
363363
ConnectScreen(
364-
uiState =
364+
state =
365365
ConnectUiState(
366366
location = null,
367367
selectedRelayItem = null,
@@ -398,7 +398,7 @@ class ConnectScreenTest {
398398
every { mockSelectedLocation.locationName } returns mockLocationName
399399
setContentWithTheme {
400400
ConnectScreen(
401-
uiState =
401+
state =
402402
ConnectUiState(
403403
location = null,
404404
selectedRelayItem = mockSelectedLocation,
@@ -434,7 +434,7 @@ class ConnectScreenTest {
434434
val mockedClickHandler: () -> Unit = mockk(relaxed = true)
435435
setContentWithTheme {
436436
ConnectScreen(
437-
uiState =
437+
state =
438438
ConnectUiState(
439439
location = null,
440440
selectedRelayItem = mockSelectedLocation,
@@ -468,7 +468,7 @@ class ConnectScreenTest {
468468
val mockedClickHandler: () -> Unit = mockk(relaxed = true)
469469
setContentWithTheme {
470470
ConnectScreen(
471-
uiState =
471+
state =
472472
ConnectUiState(
473473
location = null,
474474
selectedRelayItem = null,
@@ -502,7 +502,7 @@ class ConnectScreenTest {
502502
val mockedClickHandler: () -> Unit = mockk(relaxed = true)
503503
setContentWithTheme {
504504
ConnectScreen(
505-
uiState =
505+
state =
506506
ConnectUiState(
507507
location = null,
508508
selectedRelayItem = null,
@@ -535,7 +535,7 @@ class ConnectScreenTest {
535535
val mockedClickHandler: () -> Unit = mockk(relaxed = true)
536536
setContentWithTheme {
537537
ConnectScreen(
538-
uiState =
538+
state =
539539
ConnectUiState(
540540
location = null,
541541
selectedRelayItem = null,
@@ -568,7 +568,7 @@ class ConnectScreenTest {
568568
val mockedClickHandler: () -> Unit = mockk(relaxed = true)
569569
setContentWithTheme {
570570
ConnectScreen(
571-
uiState =
571+
state =
572572
ConnectUiState(
573573
location = null,
574574
selectedRelayItem = null,
@@ -609,7 +609,7 @@ class ConnectScreenTest {
609609
every { mockLocation.hostname } returns mockHostName
610610
setContentWithTheme {
611611
ConnectScreen(
612-
uiState =
612+
state =
613613
ConnectUiState(
614614
location = mockLocation,
615615
selectedRelayItem = null,
@@ -650,7 +650,7 @@ class ConnectScreenTest {
650650
)
651651
setContentWithTheme {
652652
ConnectScreen(
653-
uiState =
653+
state =
654654
ConnectUiState(
655655
location = null,
656656
selectedRelayItem = null,
@@ -686,7 +686,7 @@ class ConnectScreenTest {
686686
)
687687
setContentWithTheme {
688688
ConnectScreen(
689-
uiState =
689+
state =
690690
ConnectUiState(
691691
location = null,
692692
selectedRelayItem = null,
@@ -719,7 +719,7 @@ class ConnectScreenTest {
719719
val expiryDate = DateTime(2020, 11, 11, 10, 10)
720720
setContentWithTheme {
721721
ConnectScreen(
722-
uiState =
722+
state =
723723
ConnectUiState(
724724
location = null,
725725
selectedRelayItem = null,
@@ -757,7 +757,7 @@ class ConnectScreenTest {
757757
setContentWithTheme {
758758
ConnectScreen(
759759
onUpdateVersionClick = mockedClickHandler,
760-
uiState =
760+
state =
761761
ConnectUiState(
762762
location = null,
763763
selectedRelayItem = null,
@@ -791,7 +791,7 @@ class ConnectScreenTest {
791791
setContentWithTheme {
792792
ConnectScreen(
793793
onManageAccountClick = mockedClickHandler,
794-
uiState =
794+
state =
795795
ConnectUiState(
796796
location = null,
797797
selectedRelayItem = null,
@@ -822,10 +822,7 @@ class ConnectScreenTest {
822822
// Arrange
823823
val onAccountClickMockk: () -> Unit = mockk(relaxed = true)
824824
setContentWithTheme {
825-
ConnectScreen(
826-
uiState = ConnectUiState.INITIAL,
827-
onAccountClick = onAccountClickMockk
828-
)
825+
ConnectScreen(state = ConnectUiState.INITIAL, onAccountClick = onAccountClickMockk)
829826
}
830827

831828
// Assert

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class FilterScreenTest {
2727
composeExtension.use {
2828
setContentWithTheme {
2929
FilterScreen(
30-
uiState =
30+
state =
3131
RelayFilterState(
3232
allProviders = DUMMY_RELAY_ALL_PROVIDERS,
3333
selectedOwnership = null,
@@ -45,7 +45,7 @@ class FilterScreenTest {
4545
composeExtension.use {
4646
setContentWithTheme {
4747
FilterScreen(
48-
uiState =
48+
state =
4949
RelayFilterState(
5050
allProviders = DUMMY_RELAY_ALL_PROVIDERS,
5151
selectedOwnership = null,
@@ -63,7 +63,7 @@ class FilterScreenTest {
6363
composeExtension.use {
6464
setContentWithTheme {
6565
FilterScreen(
66-
uiState =
66+
state =
6767
RelayFilterState(
6868
allProviders = DUMMY_RELAY_ALL_PROVIDERS,
6969
selectedOwnership = Ownership.MullvadOwned,
@@ -81,7 +81,7 @@ class FilterScreenTest {
8181
composeExtension.use {
8282
setContentWithTheme {
8383
FilterScreen(
84-
uiState =
84+
state =
8585
RelayFilterState(
8686
allProviders = DUMMY_RELAY_ALL_PROVIDERS,
8787
selectedOwnership = Ownership.Rented,
@@ -99,7 +99,7 @@ class FilterScreenTest {
9999
composeExtension.use {
100100
setContentWithTheme {
101101
FilterScreen(
102-
uiState =
102+
state =
103103
RelayFilterState(
104104
allProviders = DUMMY_RELAY_ALL_PROVIDERS,
105105
selectedOwnership = null,
@@ -120,7 +120,7 @@ class FilterScreenTest {
120120
val mockClickListener: () -> Unit = mockk(relaxed = true)
121121
setContentWithTheme {
122122
FilterScreen(
123-
uiState =
123+
state =
124124
RelayFilterState(
125125
allProviders = listOf(),
126126
selectedOwnership = null,

0 commit comments

Comments
 (0)