Skip to content

Commit 8784a6a

Browse files
committed
1.0.0 (1000)
1 parent d931b88 commit 8784a6a

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

Common/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ flavorDimensions = ['wearos','libreVersion','SiBionics', 'DexCom','Google']
165165
libreOld {
166166
//****** Zet op rollout op 100% ******
167167
dimension 'libreVersion'
168-
versionCode 901 //LIBRE2ONLY
168+
versionCode 1000 //LIBRE2ONLY
169169
// versionName '10.3.10-no3'
170170
versionNameSuffix '-no3'
171171
buildConfigField 'int', 'libreVersion', '2'
@@ -179,7 +179,7 @@ flavorDimensions = ['wearos','libreVersion','SiBionics', 'DexCom','Google']
179179
// minSdk 23
180180
dimension 'libreVersion'
181181
versionNameSuffix '-li3'
182-
versionCode 819 //LIBRE3
182+
versionCode 1000 //LIBRE3
183183
//****** Zet op rollout op 100% ******
184184

185185
buildConfigField 'int', 'libreVersion', '3'
@@ -194,7 +194,7 @@ flavorDimensions = ['wearos','libreVersion','SiBionics', 'DexCom','Google']
194194
si {
195195
dimension 'SiBionics'
196196
versionNameSuffix '-si'
197-
versionCode 819
197+
versionCode 1000
198198
buildConfigField 'int', 'SiBionics', '1'
199199
externalNativeBuild.cmake {
200200
cppFlags " -DSIBIONICS=1 "
@@ -203,7 +203,7 @@ flavorDimensions = ['wearos','libreVersion','SiBionics', 'DexCom','Google']
203203
}
204204
nosi {
205205
dimension 'SiBionics'
206-
versionCode 818
206+
versionCode 1000
207207
versionNameSuffix '-nosi'
208208
buildConfigField 'int', 'SiBionics', '0'
209209
externalNativeBuild.cmake {
@@ -221,7 +221,7 @@ flavorDimensions = ['wearos','libreVersion','SiBionics', 'DexCom','Google']
221221
minSdkVersion 26
222222
buildConfigField 'int', 'minSDK', "$minSdk"
223223
manifestPlaceholders["minSDK"] = "$minSdk"
224-
versionCode 820 //WATCH
224+
versionCode 1000 //WATCH
225225
//****** Zet op rollout op 100% ******
226226
//versionName '10.3.10-wear'
227227
versionNameSuffix '-wear'

Common/src/mobile/java/tk/glucodata/ui/SensorCard.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,11 +1452,10 @@ fun SensorCard(
14521452
// Feature: Detailed Sensor Status
14531453
Spacer(modifier = Modifier.height(8.dp))
14541454
Row(
1455+
modifier = Modifier.fillMaxWidth(),
14551456
verticalAlignment = Alignment.CenterVertically,
1456-
// horizontalArrangement = Arrangement.spacedBy(8.dp)
1457+
horizontalArrangement = Arrangement.spacedBy(10.dp)
14571458
) {
1458-
1459-
14601459
val sensorStatusText = when {
14611460
sensor.detailedStatus.isNotEmpty() -> sensor.detailedStatus
14621461
sensor.connectionStatus.isNotEmpty() -> sensor.connectionStatus
@@ -1469,7 +1468,8 @@ fun SensorCard(
14691468
style = MaterialTheme.typography.titleSmall,
14701469
color = MaterialTheme.colorScheme.onSurface,
14711470
maxLines = 1,
1472-
overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis
1471+
overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
1472+
modifier = Modifier.weight(1f, fill = false)
14731473
)
14741474
}
14751475
currentSnapshot?.let { snapshot ->

Common/src/mobile/java/tk/glucodata/ui/journal/JournalScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ private fun JournalHeader(
388388
Row(
389389
modifier = Modifier
390390
.fillMaxWidth()
391-
.padding(bottom = 12.dp),
391+
.padding(bottom = 22.dp),
392392
horizontalArrangement = Arrangement.SpaceBetween,
393393
verticalAlignment = Alignment.CenterVertically
394394
) {

0 commit comments

Comments
 (0)