Skip to content

Commit fd5e931

Browse files
fix(mobile): Updated formatting of server address in networking (#16483)
* Updated formatting of server address in networking * fallback for undefined endpoint
1 parent d8d87bb commit fd5e931

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

mobile/lib/widgets/settings/networking_settings/networking_settings.dart

+12-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ import 'package:easy_localization/easy_localization.dart';
22
import 'package:flutter/material.dart';
33
import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
44
import 'package:hooks_riverpod/hooks_riverpod.dart';
5-
import 'package:immich_mobile/domain/models/store.model.dart';
6-
import 'package:immich_mobile/entities/store.entity.dart';
75
import 'package:immich_mobile/extensions/build_context_extensions.dart';
86
import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
97
import 'package:immich_mobile/providers/network.provider.dart';
108
import 'package:immich_mobile/services/app_settings.service.dart';
119
import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
10+
import 'package:immich_mobile/utils/url_helper.dart';
1211
import 'package:immich_mobile/widgets/settings/networking_settings/external_network_preference.dart';
1312
import 'package:immich_mobile/widgets/settings/networking_settings/local_network_preference.dart';
1413
import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
@@ -18,7 +17,7 @@ class NetworkingSettings extends HookConsumerWidget {
1817

1918
@override
2019
Widget build(BuildContext context, WidgetRef ref) {
21-
final currentEndpoint = Store.get(StoreKey.serverEndpoint);
20+
final currentEndpoint = getServerUrl();
2221
final featureEnabled =
2322
useAppSettingsState(AppSettingsEnum.autoEndpointSwitching);
2423

@@ -102,7 +101,7 @@ class NetworkingSettings extends HookConsumerWidget {
102101
padding: const EdgeInsets.only(top: 8, left: 16, bottom: 8),
103102
child: NetworkPreferenceTitle(
104103
title: "current_server_address".tr().toUpperCase(),
105-
icon: currentEndpoint.startsWith('https')
104+
icon: (currentEndpoint?.startsWith('https') ?? false)
106105
? Icons.https_outlined
107106
: Icons.http_outlined,
108107
),
@@ -119,10 +118,16 @@ class NetworkingSettings extends HookConsumerWidget {
119118
),
120119
),
121120
child: ListTile(
122-
leading:
123-
const Icon(Icons.check_circle_rounded, color: Colors.green),
121+
leading: currentEndpoint != null
122+
? const Icon(
123+
Icons.check_circle_rounded,
124+
color: Colors.green,
125+
)
126+
: const Icon(
127+
Icons.circle_outlined,
128+
),
124129
title: Text(
125-
currentEndpoint,
130+
currentEndpoint ?? "--",
126131
style: TextStyle(
127132
fontSize: 16,
128133
fontFamily: 'Inconsolata',

0 commit comments

Comments
 (0)