Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Move developer settings to Accounts

Aman0555bbbcdfb5
diff --git a/mobile/apps/auth/changes/developer-settings-ui.md b/mobile/apps/auth/changes/developer-settings-ui.md
new file mode 100644
index 0000000000..d950a90f57
--- /dev/null
+++ b/mobile/apps/auth/changes/developer-settings-ui.md
@@ -0,0 +1 @@
+- Refreshed the developer settings screen.
diff --git a/mobile/apps/auth/lib/onboarding/view/onboarding_page.dart b/mobile/apps/auth/lib/onboarding/view/onboarding_page.dart
index 04fd05b72b..5ef5de09f4 100644
--- a/mobile/apps/auth/lib/onboarding/view/onboarding_page.dart
+++ b/mobile/apps/auth/lib/onboarding/view/onboarding_page.dart
@@ -2,6 +2,7 @@ import 'dart:async';
import 'dart:io';
import 'package:dots_indicator/dots_indicator.dart';
+import 'package:ente_accounts/pages/developer_settings_page.dart';
import 'package:ente_accounts/pages/email_entry_page.dart';
import 'package:ente_accounts/pages/login_page.dart';
import 'package:ente_accounts/pages/password_entry_page.dart';
@@ -27,7 +28,6 @@ import 'package:ente_auth/utils/navigation_util.dart';
import 'package:ente_auth/utils/toast_util.dart';
import 'package:ente_events/event_bus.dart';
import 'package:ente_ui/components/alert_bottom_sheet.dart';
-import 'package:ente_ui/pages/developer_settings_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_svg/flutter_svg.dart';
diff --git a/mobile/apps/locker/changes/developer-settings-ui.md b/mobile/apps/locker/changes/developer-settings-ui.md
new file mode 100644
index 0000000000..d950a90f57
--- /dev/null
+++ b/mobile/apps/locker/changes/developer-settings-ui.md
@@ -0,0 +1 @@
+- Refreshed the developer settings screen.
diff --git a/mobile/apps/locker/lib/ui/pages/onboarding_page.dart b/mobile/apps/locker/lib/ui/pages/onboarding_page.dart
index 107d512a6e..826d1aecf4 100644
--- a/mobile/apps/locker/lib/ui/pages/onboarding_page.dart
+++ b/mobile/apps/locker/lib/ui/pages/onboarding_page.dart
@@ -1,12 +1,12 @@
import 'dart:async';
import 'package:dots_indicator/dots_indicator.dart';
+import 'package:ente_accounts/pages/developer_settings_page.dart';
import 'package:ente_accounts/pages/email_entry_page.dart';
import 'package:ente_accounts/pages/login_page.dart';
import 'package:ente_accounts/pages/password_entry_page.dart';
import 'package:ente_accounts/pages/password_reentry_page.dart';
import 'package:ente_components/ente_components.dart';
-import "package:ente_ui/pages/developer_settings_page.dart";
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import "package:flutter_svg/flutter_svg.dart";
diff --git a/mobile/packages/accounts/lib/pages/developer_settings_page.dart b/mobile/packages/accounts/lib/pages/developer_settings_page.dart
new file mode 100644
index 0000000000..3159db1c2c
--- /dev/null
+++ b/mobile/packages/accounts/lib/pages/developer_settings_page.dart
@@ -0,0 +1,147 @@
+import 'dart:async';
+
+import 'package:dio/dio.dart';
+import 'package:ente_components/ente_components.dart';
+import 'package:ente_strings/ente_strings.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:logging/logging.dart';
+
+class DeveloperSettingsPage extends StatefulWidget {
+ final String Function() getCurrentEndpoint;
+ final Future<void> Function(String url) setEndpoint;
+
+ const DeveloperSettingsPage({
+ required this.getCurrentEndpoint,
+ required this.setEndpoint,
+ super.key,
+ });
+
+ @override
+ State<DeveloperSettingsPage> createState() => _DeveloperSettingsPageState();
+}
+
+class _DeveloperSettingsPageState extends State<DeveloperSettingsPage> {
+ final _logger = Logger('DeveloperSettingsPage');
+ final _urlController = TextEditingController();
+ late String _currentEndpoint;
+
+ @override
+ void initState() {
+ super.initState();
+ _currentEndpoint = widget.getCurrentEndpoint();
+ _logger.info("Current endpoint is: $_currentEndpoint");
+ }
+
+ @override
+ void dispose() {
+ _urlController.dispose();
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final isDarkTheme = Theme.of(context).brightness == Brightness.dark;
+ final overlayStyle = SystemUiOverlayStyle(
+ statusBarIconBrightness: isDarkTheme ? Brightness.light : Brightness.dark,
+ statusBarBrightness: isDarkTheme ? Brightness.dark : Brightness.light,
+ );
+ return AnnotatedRegion<SystemUiOverlayStyle>(
+ value: overlayStyle,
+ child: Scaffold(
+ backgroundColor: context.componentColors.backgroundBase,
+ body: AppBarComponent(
+ title: context.strings.developerSettings,
+ slivers: [
+ SliverPadding(
+ padding: const EdgeInsets.fromLTRB(
+ Spacing.lg,
+ Spacing.xl,
+ Spacing.lg,
+ Spacing.xl,
+ ),
+ sliver: SliverToBoxAdapter(
+ child: Column(
+ children: [
+ Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ ExcludeSemantics(
+ child: Text(
+ context.strings.serverEndpoint,
+ style: TextStyles.bodyBold.copyWith(
+ color: context.componentColors.textBase,
+ ),
+ ),
+ ),
+ const SizedBox(height: Spacing.sm),
+ MergeSemantics(
+ child: Semantics(
+ label: context.strings.serverEndpoint,
+ child: TextInputComponent(
+ controller: _urlController,
+ hintText: _currentEndpoint,
+ autofocus: true,
+ ),
+ ),
+ ),
+ ],
+ ),
+ const SizedBox(height: Spacing.xxl),
+ ButtonComponent(
+ label: context.strings.save,
+ onTap: _saveEndpoint,
+ shouldShowSuccessState: false,
+ ),
+ ],
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+
+ Future<void> _saveEndpoint() async {
+ final String url = _urlController.text;
+ _logger.info("Entered endpoint: $url");
+ try {
+ final uri = Uri.parse(url);
+ if (uri.scheme == "http" || uri.scheme == "https") {
+ await _ping(url);
+ await widget.setEndpoint(url);
+ } else {
+ throw const FormatException();
+ }
+ } catch (e) {
+ if (!mounted) {
+ return;
+ }
+ unawaited(
+ showErrorBottomSheetComponent<void>(
+ context: context,
+ title: context.strings.invalidEndpoint,
+ message: context.strings.invalidEndpointMessage,
+ ),
+ );
+ return;
+ }
+ if (mounted) {
+ final message = context.strings.endpointUpdatedMessage;
+ Navigator.of(context).pop();
+ showToastComponent(context, message, state: BannerComponentState.success);
+ }
+ }
+
+ Future<void> _ping(String endpoint) async {
+ try {
+ final response = await Dio().get('$endpoint/ping');
+ if (response.data['message'] != 'pong') {
+ throw Exception('Invalid response');
+ }
+ } catch (e) {
+ throw Exception('Error occurred: $e');
+ }
+ }
+}
diff --git a/mobile/packages/accounts/pubspec.yaml b/mobile/packages/accounts/pubspec.yaml
index 2e8ab347d3..7ce41e5832 100644
--- a/mobile/packages/accounts/pubspec.yaml
+++ b/mobile/packages/accounts/pubspec.yaml
@@ -15,6 +15,8 @@ dependencies:
email_validator: 3.0.0
ente_base:
path: ../base
+ ente_components:
+ path: ../ente_components
ente_configuration:
path: ../configuration
ente_crypto_api:
diff --git a/mobile/packages/ui/lib/pages/developer_settings_page.dart b/mobile/packages/ui/lib/pages/developer_settings_page.dart
deleted file mode 100644
index 76bb11b466..0000000000
--- a/mobile/packages/ui/lib/pages/developer_settings_page.dart
+++ /dev/null
@@ -1,105 +0,0 @@
-import 'package:dio/dio.dart';
-import 'package:ente_logging/logging.dart';
-import 'package:ente_strings/ente_strings.dart';
-import 'package:ente_ui/components/buttons/gradient_button.dart';
-import 'package:ente_ui/utils/dialog_util.dart';
-import 'package:ente_ui/utils/toast_util.dart';
-import 'package:flutter/material.dart';
-
-class DeveloperSettingsPage extends StatefulWidget {
- final String Function() getCurrentEndpoint;
- final Future<void> Function(String url) setEndpoint;
-
- const DeveloperSettingsPage({
- required this.getCurrentEndpoint,
- required this.setEndpoint,
- super.key,
- });
-
- @override
- State<DeveloperSettingsPage> createState() => _DeveloperSettingsPageState();
-}
-
-class _DeveloperSettingsPageState extends State<DeveloperSettingsPage> {
- final _logger = Logger('DeveloperSettingsPage');
- final _urlController = TextEditingController();
- late String _currentEndpoint;
-
- @override
- void initState() {
- super.initState();
- _currentEndpoint = widget.getCurrentEndpoint();
- _logger.info("Current endpoint is: $_currentEndpoint");
- }
-
- @override
- void dispose() {
- _urlController.dispose();
- super.dispose();
- }
-
- @override
- Widget build(BuildContext context) {
- return Scaffold(
- appBar: AppBar(title: Text(context.strings.developerSettings)),
- body: Padding(
- padding: const EdgeInsets.all(16.0),
- child: Column(
- children: [
- TextField(
- controller: _urlController,
- decoration: InputDecoration(
- labelText: context.strings.serverEndpoint,
- hintText: _currentEndpoint,
- ),
- autofocus: true,
- ),
- const SizedBox(height: 40),
- GradientButton(
- onTap: () async {
- final String url = _urlController.text;
- _logger.info("Entered endpoint: $url");
- try {
- final uri = Uri.parse(url);
- if ((uri.scheme == "http" || uri.scheme == "https")) {
- await _ping(url);
- await widget.setEndpoint(url);
- } else {
- throw const FormatException();
- }
- } catch (e) {
- if (!context.mounted) {
- return;
- }
- // ignore: unawaited_futures
- showErrorDialog(
- context,
- context.strings.invalidEndpoint,
- context.strings.invalidEndpointMessage,
- );
- return;
- }
- if (context.mounted) {
- showToast(context, context.strings.endpointUpdatedMessage);
- Navigator.of(context).pop();
- }
- },
- text: context.strings.save,
- ),
- ],
- ),
- ),
- );
- }
-
- Future<void> _ping(String endpoint) async {
- try {
- final response = await Dio().get('$endpoint/ping');
- if (response.data['message'] != 'pong') {
- throw Exception('Invalid response');
- }
- } catch (e) {
- throw Exception('Error occurred: $e');
- }
- }
-}