Skip to content

Commit d043c20

Browse files
committed
update upload worker scheduling; update UI
1 parent aa446bd commit d043c20

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

app/src/main/java/com/lcl/lclmeasurementtool/sync/UploadWorker.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ class UploadWorker @AssistedInject constructor(
5757

5858
companion object {
5959
fun periodicSyncWork() =
60-
PeriodicWorkRequestBuilder<DelegatingWorker>(8, TimeUnit.HOURS)
60+
PeriodicWorkRequestBuilder<DelegatingWorker>(4, TimeUnit.HOURS)
6161
.setConstraints(Constraints(requiredNetworkType = NetworkType.CONNECTED))
6262
.setInitialDelay(10, TimeUnit.MINUTES)
63-
.setBackoffCriteria(BackoffPolicy.EXPONENTIAL, Duration.ofMinutes(10))
63+
.setBackoffCriteria(BackoffPolicy.EXPONENTIAL, Duration.ofMinutes(5))
6464
.setInputData(UploadWorker::class.delegatedData())
6565
.build()
6666

app/src/main/java/com/lcl/lclmeasurementtool/ui/HomeScreen.kt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ fun HomeScreen(modifier: Modifier = Modifier, isOffline: Boolean, mainActivityVi
6666
horizontalAlignment = Alignment.CenterHorizontally
6767
) {
6868
SignalStrengthCard(modifier = modifier, signalStrengthResult = signalStrength.value)
69+
// ConnectivityCard(
70+
// label = "Iperf",
71+
// modifier = modifier,
72+
// pingResult = pingResult.value,
73+
// uploadResult = uploadResult.value,
74+
// downloadResult = downloadResult.value
75+
// )
6976
ConnectivityCard(
70-
label = "Iperf (right)",
71-
modifier = modifier,
72-
pingResult = pingResult.value,
73-
uploadResult = uploadResult.value,
74-
downloadResult = downloadResult.value
75-
)
76-
ConnectivityCard(
77-
label = "MLab (left)",
77+
label = "MLab",
7878
modifier = modifier,
7979
pingResult = mlabPingResult.value,
8080
uploadResult = mlabUploadResult.value,
@@ -176,10 +176,9 @@ private fun ConnectivityCard(
176176
.padding(horizontal = 10.dp, vertical = 10.dp)
177177
.fillMaxWidth()
178178
) {
179-
Text(text = label, fontWeight = FontWeight.Bold, fontSize = 24.sp, modifier = Modifier.padding(start = 10.dp))
180179
Row(
181180
verticalAlignment = Alignment.CenterVertically,
182-
modifier = modifier.padding(12.dp)
181+
modifier = modifier.padding(start = 12.dp, end = 12.dp, top = 12.dp)
183182
) {
184183

185184
Icon(modifier = modifier.padding(end = 12.dp),
@@ -228,6 +227,9 @@ private fun ConnectivityCard(
228227
}
229228
}
230229
}
230+
Box(modifier = Modifier.fillMaxWidth()) {
231+
Text(text = "Powered by $label", fontWeight = FontWeight.Thin, fontSize = 10.sp, modifier = Modifier.align(Alignment.BottomEnd).padding(end = 10.dp, bottom = 4.dp))
232+
}
231233
}
232234
}
233235

0 commit comments

Comments
 (0)