Skip to content

Commit 470640c

Browse files
blopkerblopker
committed
Fix lints
1 parent 58c7b9f commit 470640c

File tree

5 files changed

+50
-50
lines changed

5 files changed

+50
-50
lines changed

‎lib/bike.dart‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class Bike extends _$Bike {
7979
if (newState == state && !force) {
8080
return;
8181
}
82-
log.d(SDLogger.BIKE, 'State update from data: $data');
82+
log.d(SDLogger.bike, 'State update from data: $data');
8383
if (state.lightLocked && state.light != newState.light) {
8484
newState = newState.copyWith(light: state.light);
8585
}
@@ -107,55 +107,55 @@ class Bike extends _$Bike {
107107
_writing = true;
108108
final repo = ref.read(connectionHandlerProvider(state.id).notifier);
109109
await repo.write(newState.toWriteData());
110-
log.d(SDLogger.BIKE, 'Wrote data to bike: ${newState.toWriteData()}');
110+
log.d(SDLogger.bike, 'Wrote data to bike: ${newState.toWriteData()}');
111111
}
112112
ref.read(bikesDBProvider.notifier).saveBike(newState);
113113
state = newState;
114114
updateStateData();
115115
}
116116

117117
void toggleLight() async {
118-
log.d(SDLogger.BIKE, 'Toggling light: ${!state.light}');
118+
log.d(SDLogger.bike, 'Toggling light: ${!state.light}');
119119
writeStateData(state.copyWith(light: !state.light));
120120
}
121121

122122
void toggleMode() async {
123-
log.d(SDLogger.BIKE, 'Toggling mode to: ${state.nextMode}');
123+
log.d(SDLogger.bike, 'Toggling mode to: ${state.nextMode}');
124124
writeStateData(state.copyWith(mode: state.nextMode));
125125
}
126126

127127
void toggleAssist() async {
128128
final newAssist = (state.assist + 1) % 5;
129-
log.d(SDLogger.BIKE, 'Toggling assist to: $newAssist');
129+
log.d(SDLogger.bike, 'Toggling assist to: $newAssist');
130130
writeStateData(state.copyWith(assist: newAssist));
131131
}
132132

133133
void toggleLightLocked() async {
134-
log.d(SDLogger.BIKE, 'Toggling light lock: ${!state.lightLocked}');
134+
log.d(SDLogger.bike, 'Toggling light lock: ${!state.lightLocked}');
135135
writeStateData(state.copyWith(lightLocked: !state.lightLocked),
136136
saveToBike: false);
137137
}
138138

139139
void toggleModeLocked() async {
140-
log.d(SDLogger.BIKE, 'Toggling mode lock: ${!state.modeLocked}');
140+
log.d(SDLogger.bike, 'Toggling mode lock: ${!state.modeLocked}');
141141
writeStateData(state.copyWith(modeLocked: !state.modeLocked),
142142
saveToBike: false);
143143
}
144144

145145
void toggleAssistLocked() async {
146-
log.d(SDLogger.BIKE, 'Toggling assist lock: ${!state.assistLocked}');
146+
log.d(SDLogger.bike, 'Toggling assist lock: ${!state.assistLocked}');
147147
writeStateData(state.copyWith(assistLocked: !state.assistLocked),
148148
saveToBike: false);
149149
}
150150

151151
void toggleBackgroundLock() async {
152-
log.d(SDLogger.BIKE, 'Toggling background lock: ${!state.modeLock}');
152+
log.d(SDLogger.bike, 'Toggling background lock: ${!state.modeLock}');
153153
writeStateData(state.copyWith(modeLock: !state.modeLock),
154154
saveToBike: false);
155155
}
156156

157157
void deleteStateData(BikeState bike) {
158-
log.i(SDLogger.BIKE, 'Deleting bike: ${bike.name}');
158+
log.i(SDLogger.bike, 'Deleting bike: ${bike.name}');
159159
ref.read(bikesDBProvider.notifier).deleteBike(bike);
160160
}
161161
}

‎lib/db.dart‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ Future<File> get _bikesFile async {
3636
}
3737

3838
Future<File> _writeBikes(List<BikeState> bikes) async {
39-
log.d(SDLogger.DB, 'Writing bikes to file');
39+
log.d(SDLogger.db, 'Writing bikes to file');
4040
if (kDebugMode) {
41-
log.d(SDLogger.DB, 'Bike data: ${jsonEncode(bikes)}');
41+
log.d(SDLogger.db, 'Bike data: ${jsonEncode(bikes)}');
4242
}
4343
final file = await _bikesFile;
4444
return file.writeAsString(jsonEncode(bikes));
@@ -48,29 +48,29 @@ Future<SettingsModel> _readSettings() async {
4848
try {
4949
final file = await _settingsFile;
5050
final contents = await file.readAsString();
51-
log.d(SDLogger.DB, 'Read settings');
51+
log.d(SDLogger.db, 'Read settings');
5252
return SettingsModel.fromJson(jsonDecode(contents));
5353
} catch (e) {
54-
log.w(SDLogger.DB, 'No settings found, using defaults');
54+
log.w(SDLogger.db, 'No settings found, using defaults');
5555
return const SettingsModel();
5656
}
5757
}
5858

5959
Future<List<BikeState>> _readBikes() async {
60-
log.d(SDLogger.DB, 'Reading bikes from file');
60+
log.d(SDLogger.db, 'Reading bikes from file');
6161
try {
6262
final file = await _bikesFile;
6363
final contents = await file.readAsString();
6464
if (kDebugMode) {
65-
log.d(SDLogger.DB, 'Read contents: $contents');
65+
log.d(SDLogger.db, 'Read contents: $contents');
6666
}
6767
final bikes = (jsonDecode(contents) as List)
6868
.map((e) => BikeState.fromJson(e as Map<String, Object?>))
6969
.toList();
70-
log.d(SDLogger.DB, 'Read ${bikes.length} bikes');
70+
log.d(SDLogger.db, 'Read ${bikes.length} bikes');
7171
return bikes;
7272
} catch (e) {
73-
log.e(SDLogger.DB, 'Error reading bikes', e);
73+
log.e(SDLogger.db, 'Error reading bikes', e);
7474
return [];
7575
}
7676
}
@@ -88,26 +88,26 @@ class BikesDB extends _$BikesDB {
8888
final index = bikes.indexWhere((element) => element.id == bike.id);
8989
if (index == -1) {
9090
bikes.add(bike);
91-
log.i(SDLogger.DB, 'Added new bike: ${bike.name}');
91+
log.i(SDLogger.db, 'Added new bike: ${bike.name}');
9292
} else {
9393
bikes[index] = bike;
94-
log.d(SDLogger.DB, 'Updated bike: ${bike.name}');
94+
log.d(SDLogger.db, 'Updated bike: ${bike.name}');
9595
}
9696
state = bikes;
9797
_writeBikes(state);
9898
}
9999

100100
void deleteBike(BikeState bike) {
101101
state.removeWhere((element) => element.id == bike.id);
102-
log.i(SDLogger.DB, 'Deleted bike: ${bike.name}');
102+
log.i(SDLogger.db, 'Deleted bike: ${bike.name}');
103103
_writeBikes(state);
104104
}
105105

106106
BikeState? getBike(String id) {
107107
try {
108108
return state.firstWhere((element) => element.id == id);
109109
} catch (e) {
110-
log.d(SDLogger.DB, 'No bike found with ID: $id');
110+
log.d(SDLogger.db, 'No bike found with ID: $id');
111111
return null;
112112
}
113113
}
@@ -123,7 +123,7 @@ class SettingsDB extends _$SettingsDB {
123123

124124
void save(SettingsModel settings) {
125125
_settingsFile.then((file) => file.writeAsString(jsonEncode(settings)));
126-
log.d(SDLogger.DB, 'Saved settings: $settings');
126+
log.d(SDLogger.db, 'Saved settings: $settings');
127127
state = settings;
128128
}
129129
}

‎lib/main.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class _HomePageState extends ConsumerState<HomePage> {
115115
var denied =
116116
snapshot.data!.values.any((element) => element.isDenied);
117117
if (denied) {
118-
log.i(SDLogger.BIKE, 'Permission denied: ${snapshot.data}');
118+
log.i(SDLogger.bike, 'Permission denied: ${snapshot.data}');
119119
return const PermissionPage();
120120
}
121121
return const BikeSelectWidget();

‎lib/repository.dart‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class ConnectionHandler extends _$ConnectionHandler {
4848
ref.onDispose(_dispose);
4949
_device = BluetoothDevice.fromId(deviceId);
5050
_deviceSub = _device.connectionState.listen((dstate) {
51-
log.d(SDLogger.BLUETOOTH, 'Connection state: $dstate');
51+
log.d(SDLogger.bluetooth, 'Connection state: $dstate');
5252
if (dstate == BluetoothConnectionState.connected) {
5353
state = SDBluetoothConnectionState.connected;
5454
} else if (dstate == BluetoothConnectionState.disconnected) {
@@ -66,13 +66,13 @@ class ConnectionHandler extends _$ConnectionHandler {
6666
}
6767

6868
void _dispose() {
69-
log.d(SDLogger.BLUETOOTH, "DISPOSE ConnectionHandler");
69+
log.d(SDLogger.bluetooth, "DISPOSE ConnectionHandler");
7070
_deviceSub?.cancel();
7171
_reconnectTimer?.cancel();
7272
}
7373

7474
Future<void> connect() async {
75-
log.d(SDLogger.BLUETOOTH, "Connecting to ${_device.remoteId}");
75+
log.d(SDLogger.bluetooth, "Connecting to ${_device.remoteId}");
7676
if (_device.isConnected) {
7777
state = SDBluetoothConnectionState.connected;
7878
return;
@@ -88,11 +88,11 @@ class ConnectionHandler extends _$ConnectionHandler {
8888
if (Platform.isAndroid) {
8989
await _device.requestMtu(512);
9090
}
91-
log.i(SDLogger.BLUETOOTH, 'Connected to ${_device.remoteId.str}');
91+
log.i(SDLogger.bluetooth, 'Connected to ${_device.remoteId.str}');
9292
state = SDBluetoothConnectionState.connected;
9393
await _device.discoverServices();
9494
} catch (e) {
95-
log.e(SDLogger.BLUETOOTH, 'Error connecting', e);
95+
log.e(SDLogger.bluetooth, 'Error connecting', e);
9696
state = SDBluetoothConnectionState.disconnected;
9797
}
9898
}
@@ -127,43 +127,43 @@ class BluetoothRepository {
127127
}
128128

129129
Future<void> scan() async {
130-
log.i(SDLogger.BLUETOOTH, 'Starting Bluetooth scan');
130+
log.i(SDLogger.bluetooth, 'Starting Bluetooth scan');
131131
if (Platform.isAndroid) {
132132
try {
133133
await FlutterBluePlus.turnOn();
134134
} catch (e) {
135-
log.e(SDLogger.BLUETOOTH, 'Error turning on bluetooth', e);
135+
log.e(SDLogger.bluetooth, 'Error turning on bluetooth', e);
136136
}
137137
}
138138
try {
139139
await FlutterBluePlus.startScan(
140140
timeout: const Duration(seconds: 100),
141141
withKeywords: ['SUPER${70 + 3}']);
142-
log.d(SDLogger.BLUETOOTH, 'Scan initiated with timeout: 100s');
142+
log.d(SDLogger.bluetooth, 'Scan initiated with timeout: 100s');
143143
await FlutterBluePlus.isScanning.where((val) => val == false).first;
144-
log.d(SDLogger.BLUETOOTH, 'Scan completed');
144+
log.d(SDLogger.bluetooth, 'Scan completed');
145145
} catch (e) {
146-
log.e(SDLogger.BLUETOOTH, 'Error starting scan', e);
146+
log.e(SDLogger.bluetooth, 'Error starting scan', e);
147147
}
148148
}
149149

150150
Future<void> stopScan() async {
151151
try {
152152
await FlutterBluePlus.stopScan();
153-
log.d(SDLogger.BLUETOOTH, 'Scan stopped manually');
153+
log.d(SDLogger.bluetooth, 'Scan stopped manually');
154154
} catch (e) {
155-
log.e(SDLogger.BLUETOOTH, 'Error stopping scan', e);
155+
log.e(SDLogger.bluetooth, 'Error stopping scan', e);
156156
}
157157
}
158158

159159
Future<void> disconnect() async {
160160
try {
161161
for (var device in FlutterBluePlus.connectedDevices) {
162162
await device.disconnect();
163-
log.i(SDLogger.BLUETOOTH, 'Disconnected from ${device.remoteId.str}');
163+
log.i(SDLogger.bluetooth, 'Disconnected from ${device.remoteId.str}');
164164
}
165165
} catch (e) {
166-
log.e(SDLogger.BLUETOOTH, 'Error disconnecting', e);
166+
log.e(SDLogger.bluetooth, 'Error disconnecting', e);
167167
}
168168
}
169169

@@ -176,7 +176,7 @@ class BluetoothRepository {
176176
try {
177177
var servicesList = device.servicesList;
178178
if (servicesList.isEmpty) {
179-
log.w(SDLogger.BLUETOOTH,
179+
log.w(SDLogger.bluetooth,
180180
'No services discovered for ${device.remoteId}, attempting discovery');
181181
return;
182182
}
@@ -193,21 +193,21 @@ class BluetoothRepository {
193193
throw Exception('Characteristic $characteristicId not found'));
194194

195195
await char.write(data);
196-
log.d(SDLogger.BLUETOOTH, 'Wrote data to ${device.remoteId.str}: $data');
196+
log.d(SDLogger.bluetooth, 'Wrote data to ${device.remoteId.str}: $data');
197197
} catch (e) {
198-
log.e(SDLogger.BLUETOOTH, 'Error writing to ${device.remoteId}', e);
198+
log.e(SDLogger.bluetooth, 'Error writing to ${device.remoteId}', e);
199199
}
200200
}
201201

202202
Future<List<int>?> read(BluetoothDevice device,
203203
{Guid? serviceId, Guid? characteristicId}) async {
204204
serviceId ??= UUID_METRICS_SERVICE;
205205
characteristicId ??= UUID_CHARACTERISTIC_REGISTER;
206-
log.d(SDLogger.BLUETOOTH, 'Reading from ${device.remoteId}');
206+
log.d(SDLogger.bluetooth, 'Reading from ${device.remoteId}');
207207
try {
208208
var servicesList = device.servicesList;
209209
if (servicesList.isEmpty) {
210-
log.w(SDLogger.BLUETOOTH,
210+
log.w(SDLogger.bluetooth,
211211
'No services discovered for ${device.remoteId}, attempting discovery');
212212
return null;
213213
}
@@ -217,10 +217,10 @@ class BluetoothRepository {
217217
.firstWhere((element) => element.uuid == characteristicId);
218218
final result = await char.read();
219219
log.d(
220-
SDLogger.BLUETOOTH, 'Read data from ${device.remoteId.str}: $result');
220+
SDLogger.bluetooth, 'Read data from ${device.remoteId.str}: $result');
221221
return result;
222222
} catch (e) {
223-
log.e(SDLogger.BLUETOOTH, 'Error reading from ${device.remoteId}', e);
223+
log.e(SDLogger.bluetooth, 'Error reading from ${device.remoteId}', e);
224224
}
225225
return null;
226226
}

‎lib/utils/logger.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ class SDLogger {
1212
late Logger _logger;
1313

1414
// Tag constants to categorize logs
15-
static const String BLUETOOTH = 'Bluetooth';
16-
static const String BIKE = 'Bike';
17-
static const String UI = 'UI';
18-
static const String DB = 'Database';
19-
static const String GENERAL = 'App';
15+
static const String bluetooth = 'Bluetooth';
16+
static const String bike = 'Bike';
17+
static const String ui = 'UI';
18+
static const String db = 'Database';
19+
static const String general = 'App';
2020

2121
SDLogger._internal() {
2222
// Initialize with appropriate settings

0 commit comments

Comments
 (0)