Skip to content

Commit c094e80

Browse files
authored
Merge pull request #165 from NordicSemiconductor/deprecations
Missing deprecations fixed
2 parents 4b07c66 + 30b0052 commit c094e80

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

analytics/src/main/java/no/nordicsemi/android/common/analytics/view/AnalyticsPermissionRequestDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import androidx.compose.runtime.setValue
4747
import androidx.compose.ui.Modifier
4848
import androidx.compose.ui.res.stringResource
4949
import androidx.compose.ui.tooling.preview.Preview
50-
import androidx.hilt.navigation.compose.hiltViewModel
50+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
5151
import kotlinx.coroutines.flow.collectLatest
5252
import no.nordicsemi.android.common.analytics.R
5353
import no.nordicsemi.android.common.analytics.viewmodel.AnalyticsPermissionViewModel

analytics/src/main/java/no/nordicsemi/android/common/analytics/view/AnalyticsPermissionSettingsSwitch.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,22 @@ import androidx.compose.foundation.clickable
3737
import androidx.compose.foundation.layout.Column
3838
import androidx.compose.foundation.layout.Row
3939
import androidx.compose.foundation.layout.fillMaxWidth
40-
import androidx.compose.foundation.layout.padding
4140
import androidx.compose.material3.Checkbox
4241
import androidx.compose.material3.MaterialTheme
4342
import androidx.compose.material3.Text
44-
import androidx.compose.runtime.*
43+
import androidx.compose.runtime.Composable
44+
import androidx.compose.runtime.getValue
45+
import androidx.compose.runtime.mutableStateOf
4546
import androidx.compose.runtime.saveable.rememberSaveable
47+
import androidx.compose.runtime.setValue
4648
import androidx.compose.ui.Alignment
4749
import androidx.compose.ui.Modifier
4850
import androidx.compose.ui.res.stringResource
4951
import androidx.compose.ui.tooling.preview.Preview
50-
import androidx.compose.ui.unit.dp
51-
import androidx.hilt.navigation.compose.hiltViewModel
52+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
5253
import androidx.lifecycle.compose.collectAsStateWithLifecycle
53-
import no.nordicsemi.android.common.analytics.R
5454
import no.nordicsemi.android.common.analytics.AnalyticsPermissionData
55+
import no.nordicsemi.android.common.analytics.R
5556
import no.nordicsemi.android.common.analytics.viewmodel.AnalyticsPermissionViewModel
5657

5758
@Composable

analytics/src/main/java/no/nordicsemi/android/common/analytics/view/AnalyticsPermissionSwitchDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import androidx.compose.ui.Alignment
5050
import androidx.compose.ui.Modifier
5151
import androidx.compose.ui.res.stringResource
5252
import androidx.compose.ui.tooling.preview.Preview
53-
import androidx.hilt.navigation.compose.hiltViewModel
53+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
5454
import androidx.lifecycle.compose.collectAsStateWithLifecycle
5555
import no.nordicsemi.android.common.analytics.AnalyticsPermissionData
5656
import no.nordicsemi.android.common.analytics.R

permissions-notification/src/main/java/no/nordicsemi/android/common/permissions/notification/RequestNotificationPermission.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ package no.nordicsemi.android.common.permissions.notification
3434
import androidx.compose.runtime.Composable
3535
import androidx.compose.runtime.LaunchedEffect
3636
import androidx.compose.runtime.getValue
37-
import androidx.hilt.navigation.compose.hiltViewModel
37+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
3838
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3939
import no.nordicsemi.android.common.permissions.notification.utils.NotAvailableReason
4040
import no.nordicsemi.android.common.permissions.notification.utils.NotificationPermissionState

0 commit comments

Comments
 (0)