Skip to content

Commit 4c08587

Browse files
WavesonicsWavesonics
committed
Upgrade libraries
1 parent 74ad76e commit 4c08587

8 files changed

Lines changed: 78 additions & 78 deletions

File tree

‎app/src/main/kotlin/com/darkrockstudios/app/securecamera/camera/ZoomMeter.kt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ fun ZoomMeter(
7878
.height(50.dp)
7979
) {
8080
Canvas(
81-
modifier = Modifier.Companion.fillMaxSize()
81+
modifier = Modifier.fillMaxSize()
8282
) {
8383
val canvasWidth = size.width
8484
val canvasHeight = size.height
@@ -88,11 +88,11 @@ fun ZoomMeter(
8888
val lineLength = lineEndX - lineStartX
8989

9090
drawLine(
91-
color = Color.Companion.LightGray,
91+
color = Color.LightGray,
9292
start = Offset(lineStartX, centerY),
9393
end = Offset(lineEndX, centerY),
9494
strokeWidth = 2.dp.toPx(),
95-
cap = StrokeCap.Companion.Round
95+
cap = StrokeCap.Round
9696
)
9797

9898
// Draw tick marks at 1.0x, 2.0x, and 4.0x
@@ -106,11 +106,11 @@ fun ZoomMeter(
106106
val tickX = lineStartX + (normalizedTickPosition * lineLength)
107107

108108
drawLine(
109-
color = Color.Companion.White,
109+
color = Color.White,
110110
start = Offset(tickX, centerY),
111111
end = Offset(tickX, centerY - tickHeight),
112112
strokeWidth = 1.5.dp.toPx(),
113-
cap = StrokeCap.Companion.Round
113+
cap = StrokeCap.Round
114114
)
115115
}
116116
}
@@ -128,30 +128,30 @@ fun ZoomMeter(
128128
// Min zoom text
129129
Text(
130130
text = String.format("%.1fx", min),
131-
color = Color.Companion.White,
131+
color = Color.White,
132132
style = MaterialTheme.typography.bodySmall,
133-
modifier = Modifier.Companion
134-
.align(Alignment.Companion.BottomStart)
133+
modifier = Modifier
134+
.align(Alignment.BottomStart)
135135
.padding(start = 8.dp)
136136
)
137137

138138
// Max zoom text
139139
Text(
140140
text = String.format("%.1fx", max),
141-
color = Color.Companion.White,
141+
color = Color.White,
142142
style = MaterialTheme.typography.bodySmall,
143-
modifier = Modifier.Companion
144-
.align(Alignment.Companion.BottomEnd)
143+
modifier = Modifier
144+
.align(Alignment.BottomEnd)
145145
.padding(end = 8.dp)
146146
)
147147

148148
// Current zoom text
149149
Text(
150150
text = String.format("%.1fx", current),
151-
color = Color.Companion.White,
151+
color = Color.White,
152152
style = MaterialTheme.typography.bodySmall,
153-
modifier = Modifier.Companion
154-
.align(Alignment.Companion.TopCenter)
153+
modifier = Modifier
154+
.align(Alignment.TopCenter)
155155
.padding(top = 4.dp)
156156
)
157157
}

‎app/src/main/kotlin/com/darkrockstudios/app/securecamera/introduction/SecurityContent.kt‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ fun SecurityContent(modifier: Modifier, viewModel: IntroductionViewModel) {
3131
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
3232
Box(modifier = modifier) {
3333
Column(
34-
modifier = Modifier.Companion
34+
modifier = Modifier
3535
.verticalScroll(rememberScrollState())
3636
.widthIn(max = 512.dp)
37-
.align(Alignment.Companion.Center),
38-
horizontalAlignment = Alignment.Companion.CenterHorizontally,
37+
.align(Alignment.Center),
38+
horizontalAlignment = Alignment.CenterHorizontally,
3939
verticalArrangement = Arrangement.Center
4040
) {
4141
Icon(
42-
modifier = Modifier.Companion
42+
modifier = Modifier
4343
.size(96.dp)
4444
.padding(16.dp),
4545
imageVector = Icons.Filled.Lock,
@@ -50,8 +50,8 @@ fun SecurityContent(modifier: Modifier, viewModel: IntroductionViewModel) {
5050
Text(
5151
text = stringResource(R.string.security_intro_supported_security_label),
5252
style = MaterialTheme.typography.headlineMedium,
53-
textAlign = TextAlign.Companion.Center,
54-
modifier = Modifier.Companion.padding(bottom = 8.dp)
53+
textAlign = TextAlign.Center,
54+
modifier = Modifier.padding(bottom = 8.dp)
5555
)
5656

5757
when (uiState.securityLevel) {
@@ -78,15 +78,15 @@ fun ColumnScope.StrongSecurityContent(modifier: Modifier = Modifier, viewModel:
7878
style = MaterialTheme.typography.headlineMedium,
7979
fontWeight = FontWeight.Bold,
8080
color = Color.Green,
81-
textAlign = TextAlign.Companion.Center,
82-
modifier = Modifier.Companion.padding(bottom = 8.dp)
81+
textAlign = TextAlign.Center,
82+
modifier = Modifier.padding(bottom = 8.dp)
8383
)
8484

8585
Text(
8686
text = stringResource(R.string.security_intro_security_level_strong_explainer),
8787
style = MaterialTheme.typography.bodyLarge,
8888
fontWeight = FontWeight.Bold,
89-
modifier = Modifier.Companion.padding(bottom = 8.dp)
89+
modifier = Modifier.padding(bottom = 8.dp)
9090
)
9191

9292
AdvancedHardwareSection(viewModel)
@@ -98,14 +98,14 @@ fun ColumnScope.TeeSecurityContent(viewModel: IntroductionViewModel) {
9898
text = stringResource(R.string.security_intro_security_level_normal),
9999
style = MaterialTheme.typography.headlineMedium,
100100
fontWeight = FontWeight.Bold,
101-
textAlign = TextAlign.Companion.Center,
102-
modifier = Modifier.Companion.padding(bottom = 8.dp)
101+
textAlign = TextAlign.Center,
102+
modifier = Modifier.padding(bottom = 8.dp)
103103
)
104104

105105
Text(
106106
text = stringResource(R.string.security_intro_security_level_normal_explainer),
107107
style = MaterialTheme.typography.bodyLarge,
108-
modifier = Modifier.Companion.padding(bottom = 8.dp)
108+
modifier = Modifier.padding(bottom = 8.dp)
109109
)
110110

111111
AdvancedHardwareSection(viewModel)
@@ -117,16 +117,16 @@ fun ColumnScope.SoftwareSecurityContent(viewModel: IntroductionViewModel) {
117117
text = stringResource(R.string.security_intro_security_level_weak),
118118
style = MaterialTheme.typography.headlineMedium,
119119
color = Color.Red,
120-
textAlign = TextAlign.Companion.Center,
120+
textAlign = TextAlign.Center,
121121
fontWeight = FontWeight.Bold,
122122
fontStyle = FontStyle.Italic,
123-
modifier = Modifier.Companion.padding(bottom = 8.dp)
123+
modifier = Modifier.padding(bottom = 8.dp)
124124
)
125125

126126
Text(
127127
text = stringResource(R.string.security_intro_security_level_weak_explainer),
128128
style = MaterialTheme.typography.bodyLarge,
129-
modifier = Modifier.Companion.padding(bottom = 8.dp)
129+
modifier = Modifier.padding(bottom = 8.dp)
130130
)
131131
}
132132

@@ -147,7 +147,7 @@ fun ColumnScope.AdvancedHardwareSection(viewModel: IntroductionViewModel) {
147147
text = stringResource(R.string.security_intro_advanced_section),
148148
style = MaterialTheme.typography.bodyLarge,
149149
fontWeight = FontWeight.Bold,
150-
modifier = Modifier.Companion.padding(vertical = 8.dp)
150+
modifier = Modifier.padding(vertical = 8.dp)
151151
)
152152
Icon(
153153
imageVector = if (expanded) Icons.Filled.ExpandLess else Icons.Filled.ExpandMore,
@@ -167,39 +167,39 @@ fun ColumnScope.AdvancedHardwareSection(viewModel: IntroductionViewModel) {
167167
Text(
168168
text = stringResource(R.string.security_intro_string_ephemeral_label),
169169
style = MaterialTheme.typography.headlineSmall,
170-
modifier = Modifier.Companion.padding(start = 8.dp, bottom = 16.dp, end = 8.dp),
170+
modifier = Modifier.padding(start = 8.dp, bottom = 16.dp, end = 8.dp),
171171
)
172172

173173
Row(verticalAlignment = Alignment.Top) {
174174
Checkbox(
175-
modifier = Modifier.Companion.padding(bottom = 8.dp),
175+
modifier = Modifier.padding(bottom = 8.dp),
176176
checked = uiState.ephemeralKey,
177177
onCheckedChange = { viewModel.toggleEphemeralKey() },
178178
)
179179

180180
Text(
181181
text = stringResource(R.string.security_intro_string_ephemeral_explainer),
182182
style = MaterialTheme.typography.bodyMedium,
183-
modifier = Modifier.Companion.padding(bottom = 8.dp),
183+
modifier = Modifier.padding(bottom = 8.dp),
184184
)
185185
}
186186
// Text(
187187
// text = stringResource(R.string.security_intro_string_biometric_explainer),
188188
// style = MaterialTheme.typography.bodyLarge,
189-
// modifier = Modifier.Companion.padding(bottom = 8.dp),
189+
// modifier = Modifier.padding(bottom = 8.dp),
190190
// )
191191
//
192192
// Row(verticalAlignment = Alignment.CenterVertically) {
193193
// Checkbox(
194-
// modifier = Modifier.Companion.padding(bottom = 8.dp),
194+
// modifier = Modifier.padding(bottom = 8.dp),
195195
// checked = uiState.requireBiometrics,
196196
// onCheckedChange = { viewModel.toggleBiometricsRequired() },
197197
// )
198198
//
199199
// Text(
200200
// text = stringResource(R.string.security_intro_string_biometric_checkbox),
201201
// style = MaterialTheme.typography.bodyLarge,
202-
// modifier = Modifier.Companion.padding(bottom = 8.dp),
202+
// modifier = Modifier.padding(bottom = 8.dp),
203203
// )
204204
// }
205205
}

‎app/src/main/kotlin/com/darkrockstudios/app/securecamera/settings/LocationDialog.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ fun LocationDialog(
2222
) {
2323
Dialog(onDismissRequest = onDismiss) {
2424
Card(
25-
modifier = Modifier.Companion
25+
modifier = Modifier
2626
.fillMaxWidth()
2727
.padding(16.dp),
2828
shape = MaterialTheme.shapes.medium
2929
) {
3030
Column(
31-
modifier = Modifier.Companion
31+
modifier = Modifier
3232
.fillMaxWidth()
3333
.padding(16.dp)
3434
) {
@@ -41,7 +41,7 @@ fun LocationDialog(
4141
style = MaterialTheme.typography.headlineSmall
4242
)
4343

44-
Spacer(modifier = Modifier.Companion.height(8.dp))
44+
Spacer(modifier = Modifier.height(8.dp))
4545

4646
Text(
4747
text = when (locationPermissionStatus) {
@@ -52,17 +52,17 @@ fun LocationDialog(
5252
style = MaterialTheme.typography.bodyMedium
5353
)
5454

55-
Spacer(modifier = Modifier.Companion.height(16.dp))
55+
Spacer(modifier = Modifier.height(16.dp))
5656

5757
Row(
58-
modifier = Modifier.Companion.fillMaxWidth(),
58+
modifier = Modifier.fillMaxWidth(),
5959
horizontalArrangement = Arrangement.End
6060
) {
6161
TextButton(onClick = onDismiss) {
6262
Text(stringResource(id = R.string.cancel_button))
6363
}
6464

65-
Spacer(modifier = Modifier.Companion.width(8.dp))
65+
Spacer(modifier = Modifier.width(8.dp))
6666

6767
Button(
6868
onClick = {

‎app/src/main/kotlin/com/darkrockstudios/app/securecamera/settings/SecurityResetDialog.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ fun SecurityResetDialog(
2525

2626
Dialog(onDismissRequest = onDismiss) {
2727
Card(
28-
modifier = Modifier.Companion
28+
modifier = Modifier
2929
.fillMaxWidth()
3030
.padding(16.dp),
3131
shape = MaterialTheme.shapes.medium
3232
) {
3333
Column(
34-
modifier = Modifier.Companion
34+
modifier = Modifier
3535
.fillMaxWidth()
3636
.padding(16.dp)
3737
) {
@@ -52,42 +52,42 @@ fun SecurityResetDialog(
5252
)
5353
}
5454

55-
Spacer(modifier = Modifier.Companion.height(8.dp))
55+
Spacer(modifier = Modifier.height(8.dp))
5656

5757
Text(
5858
text = stringResource(id = R.string.security_reset_dialog_message),
5959
style = MaterialTheme.typography.bodyMedium
6060
)
6161

62-
Spacer(modifier = Modifier.Companion.height(16.dp))
62+
Spacer(modifier = Modifier.height(16.dp))
6363

6464
// "I Understand" switch
6565
Row(
66-
modifier = Modifier.Companion.fillMaxWidth(),
67-
verticalAlignment = Alignment.Companion.CenterVertically
66+
modifier = Modifier.fillMaxWidth(),
67+
verticalAlignment = Alignment.CenterVertically
6868
) {
6969
Text(
7070
text = stringResource(id = R.string.security_reset_understand),
7171
style = MaterialTheme.typography.bodyLarge,
72-
modifier = Modifier.Companion.weight(1f)
72+
modifier = Modifier.weight(1f)
7373
)
7474
Switch(
7575
checked = understandChecked,
7676
onCheckedChange = { understandChecked = it }
7777
)
7878
}
7979

80-
Spacer(modifier = Modifier.Companion.height(16.dp))
80+
Spacer(modifier = Modifier.height(16.dp))
8181

8282
Row(
83-
modifier = Modifier.Companion.fillMaxWidth(),
83+
modifier = Modifier.fillMaxWidth(),
8484
horizontalArrangement = Arrangement.End
8585
) {
8686
TextButton(onClick = onDismiss) {
8787
Text(stringResource(id = R.string.cancel_button))
8888
}
8989

90-
Spacer(modifier = Modifier.Companion.width(8.dp))
90+
Spacer(modifier = Modifier.width(8.dp))
9191

9292
Button(
9393
onClick = onConfirm,

‎app/src/main/kotlin/com/darkrockstudios/app/securecamera/viewphoto/PhotoInfoDialog.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ private fun InfoRow(
8282
style = MaterialTheme.typography.bodyLarge,
8383
color = MaterialTheme.colorScheme.onSurface
8484
)
85-
Spacer(modifier = Modifier.Companion.height(4.dp))
85+
Spacer(modifier = Modifier.height(4.dp))
8686

8787
Text(
8888
text = value,
8989
style = MaterialTheme.typography.bodyLarge,
9090
color = MaterialTheme.colorScheme.onSurface
9191
)
9292

93-
Spacer(modifier = Modifier.Companion.height(16.dp))
93+
Spacer(modifier = Modifier.height(16.dp))
9494
}

‎app/src/test/kotlin/com/darkrockstudios/app/securecamera/imagemanager/SecureImageRepositoryTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class SecureImageRepositoryTest {
115115
val galleryDir = secureImageRepository.getGalleryDirectory()
116116

117117
// Then
118-
assertEquals(File(context.filesDir, SecureImageRepository.Companion.PHOTOS_DIR), galleryDir)
118+
assertEquals(File(context.filesDir, SecureImageRepository.PHOTOS_DIR), galleryDir)
119119
}
120120

121121
@Test
@@ -125,7 +125,7 @@ class SecureImageRepositoryTest {
125125
decoyDir.mkdirs()
126126

127127
// Then
128-
assertEquals(File(context.filesDir, SecureImageRepository.Companion.DECOYS_DIR), decoyDir)
128+
assertEquals(File(context.filesDir, SecureImageRepository.DECOYS_DIR), decoyDir)
129129
assertTrue(decoyDir.exists())
130130
}
131131

@@ -558,7 +558,7 @@ class SecureImageRepositoryTest {
558558
photoFile = photoFile
559559
)
560560

561-
repeat(SecureImageRepository.Companion.MAX_DECOY_PHOTOS) { i ->
561+
repeat(SecureImageRepository.MAX_DECOY_PHOTOS) { i ->
562562
val decoyFile = File(decoyDir, "photo_20230101_120000_0$i.jpg")
563563
decoyFile.writeBytes("encrypted image data".toByteArray())
564564
}

0 commit comments

Comments
 (0)