Skip to content

Commit 2ec7280

Browse files
authored
Merge pull request #139 from NordicPlayground/fix/analytics-dialog
Analytics dialog fixed (paddings)
2 parents 8b86617 + ac1a08d commit 2ec7280

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,17 @@
3333

3434
package no.nordicsemi.android.common.analytics.view
3535

36-
import androidx.compose.foundation.layout.fillMaxHeight
37-
import androidx.compose.foundation.layout.fillMaxWidth
3836
import androidx.compose.foundation.rememberScrollState
3937
import androidx.compose.foundation.verticalScroll
4038
import androidx.compose.material3.AlertDialog
4139
import androidx.compose.material3.Text
4240
import androidx.compose.material3.TextButton
43-
import androidx.compose.runtime.*
41+
import androidx.compose.runtime.Composable
42+
import androidx.compose.runtime.LaunchedEffect
43+
import androidx.compose.runtime.getValue
44+
import androidx.compose.runtime.mutableStateOf
4445
import androidx.compose.runtime.saveable.rememberSaveable
46+
import androidx.compose.runtime.setValue
4547
import androidx.compose.ui.Modifier
4648
import androidx.compose.ui.res.stringResource
4749
import androidx.compose.ui.tooling.preview.Preview
@@ -97,9 +99,6 @@ fun AnalyticsPermissionRequestDialog(
9799
Text(stringResource(id = R.string.analytics_dialog_decline))
98100
}
99101
},
100-
modifier = Modifier
101-
.fillMaxHeight(0.9f)
102-
.fillMaxWidth(0.95f)
103102
)
104103
}
105104

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,19 @@ package no.nordicsemi.android.common.analytics.view
3333

3434
import androidx.compose.foundation.layout.Column
3535
import androidx.compose.foundation.layout.Row
36-
import androidx.compose.foundation.layout.fillMaxHeight
3736
import androidx.compose.foundation.layout.fillMaxWidth
3837
import androidx.compose.foundation.rememberScrollState
3938
import androidx.compose.foundation.verticalScroll
40-
import androidx.compose.material3.*
41-
import androidx.compose.runtime.*
39+
import androidx.compose.material3.AlertDialog
40+
import androidx.compose.material3.Checkbox
41+
import androidx.compose.material3.MaterialTheme
42+
import androidx.compose.material3.Text
43+
import androidx.compose.material3.TextButton
44+
import androidx.compose.runtime.Composable
45+
import androidx.compose.runtime.getValue
46+
import androidx.compose.runtime.mutableStateOf
4247
import androidx.compose.runtime.saveable.rememberSaveable
48+
import androidx.compose.runtime.setValue
4349
import androidx.compose.ui.Alignment
4450
import androidx.compose.ui.Modifier
4551
import androidx.compose.ui.res.stringResource
@@ -101,9 +107,6 @@ fun AnalyticsPermissionSwitchDialog(
101107
Text(stringResource(id = R.string.analytics_switch_dialog_button))
102108
}
103109
},
104-
modifier = Modifier
105-
.fillMaxHeight(0.9f)
106-
.fillMaxWidth(0.95f)
107110
)
108111
}
109112

0 commit comments

Comments
 (0)