ironOS native ios app
chore: remove android tick marks
+14
-4
+1
android/app/src/main/java/com/tinkcil/ui/components/ScanningOverlay.kt
+1
android/app/src/main/java/com/tinkcil/ui/components/ScanningOverlay.kt
···
4
4
import androidx.compose.foundation.layout.Column
5
5
import androidx.compose.foundation.layout.Spacer
6
6
import androidx.compose.foundation.layout.fillMaxSize
7
+
import androidx.compose.foundation.layout.fillMaxWidth
7
8
import androidx.compose.foundation.layout.height
8
9
import androidx.compose.foundation.layout.size
9
10
import androidx.compose.material.icons.Icons
+6
android/app/src/main/java/com/tinkcil/ui/components/SettingsSheet.kt
+6
android/app/src/main/java/com/tinkcil/ui/components/SettingsSheet.kt
···
15
15
import androidx.compose.material3.MaterialTheme
16
16
import androidx.compose.material3.ModalBottomSheet
17
17
import androidx.compose.material3.Slider
18
+
import androidx.compose.material3.SliderDefaults
18
19
import androidx.compose.material3.Switch
19
20
import androidx.compose.material3.Tab
20
21
import androidx.compose.material3.TabRow
···
29
30
import androidx.compose.ui.Alignment
30
31
import androidx.compose.ui.Modifier
31
32
import androidx.compose.ui.res.stringResource
33
+
import androidx.compose.ui.graphics.Color
32
34
import androidx.compose.ui.unit.dp
33
35
import com.tinkcil.R
34
36
import com.tinkcil.data.model.IronOSLiveData
···
214
216
onValueChange = { sliderValue = it },
215
217
onValueChangeFinished = { onSettingChanged(index, sliderValue.roundToInt()) },
216
218
valueRange = min.toFloat()..max.toFloat(),
219
+
colors = SliderDefaults.colors(
220
+
activeTickColor = Color.Transparent,
221
+
inactiveTickColor = Color.Transparent
222
+
),
217
223
modifier = Modifier.fillMaxWidth()
218
224
)
219
225
}
+4
-2
android/app/src/main/java/com/tinkcil/ui/components/SliderPanel.kt
+4
-2
android/app/src/main/java/com/tinkcil/ui/components/SliderPanel.kt
···
20
20
import androidx.compose.ui.res.stringResource
21
21
import androidx.compose.ui.semantics.contentDescription
22
22
import androidx.compose.ui.semantics.semantics
23
+
import androidx.compose.ui.graphics.Color
23
24
import androidx.compose.ui.unit.dp
24
25
import com.tinkcil.R
25
26
import kotlin.math.roundToInt
···
75
76
onSliderEnd()
76
77
},
77
78
valueRange = 10f..450f,
78
-
steps = 87, // (450-10)/5 - 1 = 87 steps
79
79
colors = SliderDefaults.colors(
80
80
thumbColor = MaterialTheme.colorScheme.primary,
81
-
activeTrackColor = MaterialTheme.colorScheme.primary
81
+
activeTrackColor = MaterialTheme.colorScheme.primary,
82
+
activeTickColor = Color.Transparent,
83
+
inactiveTickColor = Color.Transparent
82
84
),
83
85
modifier = Modifier
84
86
.fillMaxWidth()
+2
-2
ios/Tinkcil.xcodeproj/project.pbxproj
+2
-2
ios/Tinkcil.xcodeproj/project.pbxproj
···
253
253
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
254
254
CODE_SIGN_IDENTITY = "Apple Development";
255
255
CODE_SIGN_STYLE = Automatic;
256
-
CURRENT_PROJECT_VERSION = 9;
256
+
CURRENT_PROJECT_VERSION = 10;
257
257
DEVELOPMENT_TEAM = M67B42LX8D;
258
258
ENABLE_PREVIEWS = YES;
259
259
GENERATE_INFOPLIST_FILE = YES;
···
292
292
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
293
293
CODE_SIGN_IDENTITY = "Apple Development";
294
294
CODE_SIGN_STYLE = Automatic;
295
-
CURRENT_PROJECT_VERSION = 9;
295
+
CURRENT_PROJECT_VERSION = 10;
296
296
DEVELOPMENT_TEAM = M67B42LX8D;
297
297
ENABLE_PREVIEWS = YES;
298
298
GENERATE_INFOPLIST_FILE = YES;