Skip to content

Commit 3f582b8

Browse files
committed
remove bleonly mode, use CAPod instead
1 parent 08738a1 commit 3f582b8

File tree

3 files changed

+40
-71
lines changed

3 files changed

+40
-71
lines changed

android/app/src/main/java/me/kavishdevar/librepods/screens/AirPodsSettingsScreen.kt

Lines changed: 40 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ fun AirPodsSettingsScreen(dev: BluetoothDevice?, service: AirPodsService,
102102
var isLocallyConnected by remember { mutableStateOf(isConnected) }
103103
var isRemotelyConnected by remember { mutableStateOf(isRemotelyConnected) }
104104
val sharedPreferences = LocalContext.current.getSharedPreferences("settings", MODE_PRIVATE)
105-
val bleOnlyMode = sharedPreferences.getBoolean("ble_only_mode", false)
106105
var device by remember { mutableStateOf(dev) }
107106
var deviceName by remember {
108107
mutableStateOf(
@@ -236,78 +235,60 @@ fun AirPodsSettingsScreen(dev: BluetoothDevice?, service: AirPodsService,
236235
BatteryView(service = service)
237236
Spacer(modifier = Modifier.height(32.dp))
238237

239-
// Show BLE-only mode indicator
240-
if (bleOnlyMode) {
241-
Text(
242-
text = "BLE-only mode - advanced features disabled",
243-
style = TextStyle(
244-
fontSize = 14.sp,
245-
fontWeight = FontWeight.Medium,
246-
color = (if (isSystemInDarkTheme()) Color.White else Color.Black).copy(alpha = 0.6f),
247-
fontFamily = FontFamily(Font(R.font.sf_pro))
248-
),
249-
modifier = Modifier.padding(8.dp, bottom = 16.dp)
250-
)
251-
}
252-
253-
// Only show name field when not in BLE-only mode
254-
if (!bleOnlyMode) {
255-
NavigationButton(
256-
to = "rename",
257-
name = stringResource(R.string.name),
258-
currentState = deviceName.text,
259-
navController = navController,
260-
independent = true
261-
)
262-
263-
Spacer(modifier = Modifier.height(32.dp))
264-
NavigationButton(to = "hearing_aid", stringResource(R.string.hearing_aid), navController)
238+
NavigationButton(
239+
to = "rename",
240+
name = stringResource(R.string.name),
241+
currentState = deviceName.text,
242+
navController = navController,
243+
independent = true
244+
)
265245

266-
Spacer(modifier = Modifier.height(16.dp))
267-
NoiseControlSettings(service = service)
246+
Spacer(modifier = Modifier.height(32.dp))
247+
NavigationButton(to = "hearing_aid", stringResource(R.string.hearing_aid), navController)
268248

269-
Spacer(modifier = Modifier.height(16.dp))
270-
PressAndHoldSettings(navController = navController)
249+
Spacer(modifier = Modifier.height(16.dp))
250+
NoiseControlSettings(service = service)
271251

272-
Spacer(modifier = Modifier.height(16.dp))
273-
CallControlSettings(hazeState = hazeState)
252+
Spacer(modifier = Modifier.height(16.dp))
253+
PressAndHoldSettings(navController = navController)
274254

275-
// camera control goes here, airpods side is done, i just need to figure out how to listen to app open/close events
255+
Spacer(modifier = Modifier.height(16.dp))
256+
CallControlSettings(hazeState = hazeState)
276257

277-
Spacer(modifier = Modifier.height(16.dp))
278-
AudioSettings(navController = navController)
258+
// camera control goes here, airpods side is done, i just need to figure out how to listen to app open/close events
279259

280-
Spacer(modifier = Modifier.height(16.dp))
281-
ConnectionSettings()
260+
Spacer(modifier = Modifier.height(16.dp))
261+
AudioSettings(navController = navController)
282262

283-
Spacer(modifier = Modifier.height(16.dp))
284-
MicrophoneSettings(hazeState)
263+
Spacer(modifier = Modifier.height(16.dp))
264+
ConnectionSettings()
285265

286-
Spacer(modifier = Modifier.height(16.dp))
287-
StyledToggle(
288-
label = stringResource(R.string.sleep_detection),
289-
controlCommandIdentifier = AACPManager.Companion.ControlCommandIdentifiers.SLEEP_DETECTION_CONFIG
290-
)
266+
Spacer(modifier = Modifier.height(16.dp))
267+
MicrophoneSettings(hazeState)
291268

292-
Spacer(modifier = Modifier.height(16.dp))
293-
NavigationButton(to = "head_tracking", stringResource(R.string.head_gestures), navController)
269+
Spacer(modifier = Modifier.height(16.dp))
270+
StyledToggle(
271+
label = stringResource(R.string.sleep_detection),
272+
controlCommandIdentifier = AACPManager.Companion.ControlCommandIdentifiers.SLEEP_DETECTION_CONFIG
273+
)
294274

295-
Spacer(modifier = Modifier.height(16.dp))
296-
NavigationButton(to = "accessibility", "Accessibility", navController = navController)
275+
Spacer(modifier = Modifier.height(16.dp))
276+
NavigationButton(to = "head_tracking", stringResource(R.string.head_gestures), navController)
297277

298-
Spacer(modifier = Modifier.height(16.dp))
299-
StyledToggle(
300-
label = stringResource(R.string.off_listening_mode),
301-
controlCommandIdentifier = AACPManager.Companion.ControlCommandIdentifiers.ALLOW_OFF_OPTION,
302-
description = stringResource(R.string.off_listening_mode_description)
303-
)
278+
Spacer(modifier = Modifier.height(16.dp))
279+
NavigationButton(to = "accessibility", "Accessibility", navController = navController)
304280

305-
// an about card- everything but the version number is unknown - will add later if i find out
281+
Spacer(modifier = Modifier.height(16.dp))
282+
StyledToggle(
283+
label = stringResource(R.string.off_listening_mode),
284+
controlCommandIdentifier = AACPManager.Companion.ControlCommandIdentifiers.ALLOW_OFF_OPTION,
285+
description = stringResource(R.string.off_listening_mode_description)
286+
)
306287

307-
Spacer(modifier = Modifier.height(16.dp))
308-
NavigationButton("debug", "Debug", navController)
309-
}
288+
// an about card- everything but the version number is unknown - will add later if i find out
310289

290+
Spacer(modifier = Modifier.height(16.dp))
291+
NavigationButton("debug", "Debug", navController)
311292
Spacer(Modifier.height(24.dp))
312293
}
313294
}

android/app/src/main/java/me/kavishdevar/librepods/screens/AppSettingsScreen.kt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -229,15 +229,6 @@ fun AppSettingsScreen(navController: NavController) {
229229
sharedPreferences = sharedPreferences,
230230
)
231231

232-
StyledToggle(
233-
title = stringResource(R.string.connection_mode),
234-
label = stringResource(R.string.ble_only_mode),
235-
description = stringResource(R.string.ble_only_mode_description),
236-
checkedState = bleOnlyMode,
237-
sharedPreferenceKey = "ble_only_mode",
238-
sharedPreferences = sharedPreferences,
239-
)
240-
241232
Text(
242233
text = stringResource(R.string.conversational_awareness),
243234
style = TextStyle(

android/app/src/main/res/values/strings.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,6 @@
142142
<string name="widget">Widget</string>
143143
<string name="show_phone_battery_in_widget">Show phone battery in widget</string>
144144
<string name="show_phone_battery_in_widget_description">Display your phone\'s battery level in the widget alongside AirPods battery</string>
145-
<string name="connection_mode">Connection Mode</string>
146-
<string name="ble_only_mode">BLE Only Mode</string>
147-
<string name="ble_only_mode_description">Only use Bluetooth Low Energy for battery data and ear detection. Disables advanced features requiring L2CAP connection.</string>
148145
<string name="conversational_awareness_volume">Conversational Awareness Volume</string>
149146
<string name="quick_settings_tile">Quick Settings Tile</string>
150147
<string name="open_dialog_for_controlling">Open dialog for controlling</string>

0 commit comments

Comments
 (0)