Skip to content

Commit

Permalink
Merge branch 'master' of github.com:pebble-dev/mobile-app into rws
Browse files Browse the repository at this point in the history
  • Loading branch information
@crc-32
crc-32 committed Oct 8, 2023
2 parents b2976ac + bb29b25 commit 15d21e3
Show file tree
Hide file tree
Showing 7 changed files with 458 additions and 270 deletions.
93 changes: 93 additions & 0 deletions lib/ui/devoptions/debug_options_page.dart
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
import 'package:cobble/infrastructure/datasources/preferences.dart';
import 'package:cobble/infrastructure/pigeons/pigeons.g.dart';
import 'package:cobble/ui/common/components/cobble_button.dart';
import 'package:cobble/ui/router/cobble_scaffold.dart';
import 'package:cobble/ui/router/cobble_screen.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';

class DebugOptionsPage extends HookWidget implements CobbleScreen {
@override
Widget build(BuildContext context) {
final preferences = useProvider(preferencesProvider);
final bootUrl = useProvider(bootUrlProvider).data?.value ?? "";
final shouldOverrideBoot =
useProvider(shouldOverrideBootProvider).data?.value ?? false;
final overrideBootUrl =
useProvider(overrideBootValueProvider).data?.value ?? "";

final bootUrlController = useTextEditingController();
final bootOverrideUrlController = useTextEditingController();

final DebugControl debug = DebugControl();

useEffect(() {
bootUrlController.text = bootUrl;
}, [bootUrl]);

useEffect(() {
bootOverrideUrlController.text = overrideBootUrl;
}, [overrideBootUrl]);

return CobbleScaffold.page(
title: "App Debug Options",
child: ListView(
children: ListTile.divideTiles(
context: context,
tiles: <Widget>[
ListTile(
contentPadding:
EdgeInsets.symmetric(vertical: 10, horizontal: 15),
title: Text(
"Boot",
style: TextStyle(fontSize: 25),
)),
ListTile(
contentPadding: EdgeInsets.symmetric(vertical: 10, horizontal: 15),
title: Text("URL"),
subtitle: TextField(
controller: bootUrlController,
readOnly: true,
),
),
SwitchListTile(
value: shouldOverrideBoot,
title: Text("Override boot URL"),
subtitle: Text("If enabled, will use the override boot URL instead of the main boot URL"),
onChanged: (value) {
preferences
.whenData((prefs) => prefs.setShouldOverrideBoot(value));
}),
ListTile(
contentPadding: EdgeInsets.symmetric(vertical: 10, horizontal: 15),
title: Text("Stage2 Override"),
subtitle: Column(
children: <Widget>[
TextField(
controller: bootOverrideUrlController,
maxLines: 8,
minLines: 4,
),
Container(
alignment: Alignment.centerRight,
child: ElevatedButton(
child: Text("Save"),
onPressed: () {
preferences.whenData((prefs) =>
prefs.setOverrideBootValue(
bootOverrideUrlController.text));
},
))
],
),
),
CobbleButton(
onPressed: () => debug.collectLogs(),
label: "Share application logs",
),
],
).toList()),
);
}
}
265 changes: 174 additions & 91 deletions lib/ui/devoptions/dev_options_page.dart
View file
Original file line number Diff line number Diff line change
@@ -1,113 +1,196 @@
import 'package:cobble/domain/apps/app_logs.dart';
import 'package:cobble/domain/connection/connection_state_provider.dart';
import 'package:cobble/ui/common/components/cobble_button.dart';
import 'package:cobble/ui/common/icons/watch_icon.dart';
import 'package:cobble/ui/common/icons/fonts/rebble_icons.dart';
import 'package:cobble/ui/devoptions/test_logs_page.dart';
import 'package:cobble/ui/devoptions/debug_options_page.dart';
import 'package:cobble/infrastructure/datasources/dev_connection.dart';
import 'package:cobble/infrastructure/datasources/preferences.dart';
import 'package:cobble/infrastructure/datasources/paired_storage.dart';
import 'package:cobble/infrastructure/pigeons/pigeons.g.dart';
import 'package:cobble/ui/router/cobble_navigator.dart';
import 'package:cobble/ui/router/cobble_scaffold.dart';
import 'package:cobble/ui/router/cobble_screen.dart';
import 'package:cobble/ui/theme/with_cobble_theme.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:share/share.dart';

enum ActionItem { debugOptions }

class DevOptionsPage extends HookWidget implements CobbleScreen {
@override
Widget build(BuildContext context) {
final devConControl = useProvider(devConnectionProvider);
final devConnState = useProvider(devConnectionProvider.state);

final preferences = useProvider(preferencesProvider);
final bootUrl = useProvider(bootUrlProvider).data?.value ?? "";
final shouldOverrideBoot =
useProvider(shouldOverrideBootProvider).data?.value ?? false;
final overrideBootUrl =
useProvider(overrideBootValueProvider).data?.value ?? "";

final bootUrlController = useTextEditingController();
final bootOverrideUrlController = useTextEditingController();

useEffect(() {
bootUrlController.text = bootUrl;
}, [bootUrl]);
final connectionState = useProvider(connectionStateProvider.state);
final ConnectionControl connectionControl = ConnectionControl();
final pairedStorage = useProvider(pairedStorageProvider);

useEffect(() {
bootOverrideUrlController.text = overrideBootUrl;
}, [overrideBootUrl]);
void _onDisconnectPressed(bool inSettings) {
connectionControl.disconnect();
pairedStorage.clearDefault();
if (inSettings) Navigator.pop(context);
}

return CobbleScaffold.tab(
return CobbleScaffold.page(
title: "Developer Options",
child: ListView(
children: ListTile.divideTiles(
context: context,
tiles: <Widget>[
ListTile(
contentPadding:
EdgeInsets.symmetric(vertical: 10, horizontal: 15),
title: Text(
"Apps",
style: TextStyle(fontSize: 25),
)),
SwitchListTile(
value: devConnState.running,
title: Text("Developer Connection"),
subtitle: Text("Extremely insecure, resets outside of page" +
(devConnState.running
? "\nRunning... ${devConnState.localIp}" +
(devConnState.connected ? " **CONNECTED**" : "")
: "")),
isThreeLine: devConnState.connected,
onChanged: (checked) {
if (checked) {
devConControl.start();
} else {
devConControl.close();
actions: <Widget>[
PopupMenuButton<ActionItem>(
// Callback that sets the selected popup menu item.
onSelected: (ActionItem item) {
if (item == ActionItem.debugOptions) {
context.push(DebugOptionsPage());
}
},
),
ListTile(
contentPadding:
EdgeInsets.symmetric(vertical: 10, horizontal: 15),
title: Text(
"Boot",
style: TextStyle(fontSize: 25),
)),
ListTile(
contentPadding: EdgeInsets.symmetric(vertical: 10, horizontal: 15),
title: Text("URL"),
subtitle: TextField(
controller: bootUrlController,
readOnly: true,
},
itemBuilder: (BuildContext context) => <PopupMenuEntry<ActionItem>>[
const PopupMenuItem<ActionItem>(
value: ActionItem.debugOptions,
child: ListTile(
leading: Icon(RebbleIcons.warning),
title: Text('Rebble app debug options'),
),
),
],
),
],
child: SingleChildScrollView(
child: Column(
children: <Widget>[
SizedBox(height: 8.0),
Card(
margin: EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
child: Padding(
padding: EdgeInsets.symmetric(vertical: 16.0),
child: SwitchListTile(
value: devConnState.running,
title: Text("Developer Connection"),
subtitle: Text("Extremely insecure, resets outside of page" +
(devConnState.running
? "\nRunning... ${devConnState.localIp}" +
(devConnState.connected ? " **CONNECTED**" : "")
: "")),
isThreeLine: devConnState.connected,
onChanged: (checked) {
if (checked) {
devConControl.start();
} else {
devConControl.close();
}
},
),
),
),
Card(
margin: EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
child: Padding(
padding: EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
"Devices",
style: TextStyle(fontSize: 16),
),
// TODO: A limited copy of the widget from watches_tab.dart, we need to make this a shared component
if (connectionState.currentConnectedWatch != null) ... [
Container(
child: Row(children: <Widget>[
Container(
child: Center(
child: PebbleWatchIcon(connectionState.currentConnectedWatch!.model)),
),
SizedBox(width: 16),
Column(
children: <Widget>[
Text(connectionState.currentConnectedWatch!.name!, style: TextStyle(fontSize: 16)),
SizedBox(height: 4),
Text("Connected",
style: TextStyle(
color: context.scheme!.muted)),
Wrap(
spacing: 4,
children: [],
),
],
crossAxisAlignment: CrossAxisAlignment.start,
),
]),
margin: EdgeInsets.symmetric(vertical: 16.0),
),
Container(
child: Row(children: <Widget>[
Expanded(
child: SizedBox(
height: 40.0,
child: CobbleButton(
icon: RebbleIcons.disconnect_from_watch,
label: "Disconnect",
onPressed: () => _onDisconnectPressed(false),
),
),
),
SizedBox(width: 16),
Expanded(
child: SizedBox(
height: 40.0,
child: CobbleButton(
onPressed: () async {
// Proper UI should display progress bar here
// (Downloading color screenshots can take several seconds)
// and display proper error message if operation fails

final result =
await ScreenshotsControl().takeWatchScreenshot();

if (result.success) {
Share.shareFiles([result.imagePath!],
mimeTypes: ["image/png"]);
}
},
icon: RebbleIcons.screenshot_camera,
label: "Screenshot"
),
),
),
]),
),
],
// TODO: Add device selector
],
),
),
),
),
SwitchListTile(
value: shouldOverrideBoot,
title: Text("Override boot URL"),
subtitle: Text("If enabled, will use the override boot URL instead of the main boot URL"),
onChanged: (value) {
preferences
.whenData((prefs) => prefs.setShouldOverrideBoot(value));
}),
ListTile(
contentPadding: EdgeInsets.symmetric(vertical: 10, horizontal: 15),
title: Text("Stage2 Override"),
subtitle: Column(
children: <Widget>[
TextField(
controller: bootOverrideUrlController,
maxLines: 8,
minLines: 4,
// TODO: Recent apps
Container(
width: double.infinity,
child: Card(
margin: EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
child: Padding(
padding: EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
"Logs",
style: TextStyle(fontSize: 16),
),
// TODO: List the logs separetely instead of one long list
// This is why this is just a button instead of a list
ElevatedButton(
onPressed: () => context.push(TestLogsPage()),
child: Text("Logs"),
),
],
),
),
Container(
alignment: Alignment.centerRight,
child: ElevatedButton(
child: Text("Save"),
onPressed: () {
preferences.whenData((prefs) =>
prefs.setOverrideBootValue(
bootOverrideUrlController.text));
},
))
],
),
),
)
],
).toList()),
],
),
),
);
}
}
}
Loading

0 comments on commit 15d21e3

Please sign in to comment.