mirror of
https://github.com/KevinMidboe/immich.git
synced 2025-12-08 20:29:05 +00:00
feat(mobile): use map settings from server-config (#4045)
* feat(mobile): use map settings from server-config to enable / disable map * refactor(mobile): remove async await for server info update
This commit is contained in:
@@ -2,22 +2,30 @@ import 'package:openapi/api.dart';
|
||||
|
||||
class ServerInfoState {
|
||||
final ServerVersionResponseDto serverVersion;
|
||||
final ServerFeaturesDto serverFeatures;
|
||||
final ServerConfigDto serverConfig;
|
||||
final bool isVersionMismatch;
|
||||
final String versionMismatchErrorMessage;
|
||||
|
||||
ServerInfoState({
|
||||
required this.serverVersion,
|
||||
required this.serverFeatures,
|
||||
required this.serverConfig,
|
||||
required this.isVersionMismatch,
|
||||
required this.versionMismatchErrorMessage,
|
||||
});
|
||||
|
||||
ServerInfoState copyWith({
|
||||
ServerVersionResponseDto? serverVersion,
|
||||
ServerFeaturesDto? serverFeatures,
|
||||
ServerConfigDto? serverConfig,
|
||||
bool? isVersionMismatch,
|
||||
String? versionMismatchErrorMessage,
|
||||
}) {
|
||||
return ServerInfoState(
|
||||
serverVersion: serverVersion ?? this.serverVersion,
|
||||
serverFeatures: serverFeatures ?? this.serverFeatures,
|
||||
serverConfig: serverConfig ?? this.serverConfig,
|
||||
isVersionMismatch: isVersionMismatch ?? this.isVersionMismatch,
|
||||
versionMismatchErrorMessage:
|
||||
versionMismatchErrorMessage ?? this.versionMismatchErrorMessage,
|
||||
@@ -26,7 +34,7 @@ class ServerInfoState {
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'ServerInfoState( serverVersion: $serverVersion, isVersionMismatch: $isVersionMismatch, versionMismatchErrorMessage: $versionMismatchErrorMessage)';
|
||||
return 'ServerInfoState( serverVersion: $serverVersion, serverFeatures: $serverFeatures, serverConfig: $serverConfig, isVersionMismatch: $isVersionMismatch, versionMismatchErrorMessage: $versionMismatchErrorMessage)';
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -35,6 +43,8 @@ class ServerInfoState {
|
||||
|
||||
return other is ServerInfoState &&
|
||||
other.serverVersion == serverVersion &&
|
||||
other.serverFeatures == serverFeatures &&
|
||||
other.serverConfig == serverConfig &&
|
||||
other.isVersionMismatch == isVersionMismatch &&
|
||||
other.versionMismatchErrorMessage == versionMismatchErrorMessage;
|
||||
}
|
||||
@@ -42,6 +52,8 @@ class ServerInfoState {
|
||||
@override
|
||||
int get hashCode {
|
||||
return serverVersion.hashCode ^
|
||||
serverFeatures.hashCode ^
|
||||
serverConfig.hashCode ^
|
||||
isVersionMismatch.hashCode ^
|
||||
versionMismatchErrorMessage.hashCode;
|
||||
}
|
||||
|
||||
@@ -15,6 +15,24 @@ class ServerInfoNotifier extends StateNotifier<ServerInfoState> {
|
||||
patch_: 0,
|
||||
minor: 0,
|
||||
),
|
||||
serverFeatures: ServerFeaturesDto(
|
||||
clipEncode: true,
|
||||
configFile: false,
|
||||
facialRecognition: true,
|
||||
map: true,
|
||||
oauth: false,
|
||||
oauthAutoLaunch: false,
|
||||
passwordLogin: true,
|
||||
search: true,
|
||||
sidecar: true,
|
||||
tagImage: true,
|
||||
reverseGeocoding: true,
|
||||
),
|
||||
serverConfig: ServerConfigDto(
|
||||
loginPageMessage: "",
|
||||
mapTileUrl: "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
|
||||
oauthButtonText: "",
|
||||
),
|
||||
isVersionMismatch: false,
|
||||
versionMismatchErrorMessage: "",
|
||||
),
|
||||
@@ -22,6 +40,12 @@ class ServerInfoNotifier extends StateNotifier<ServerInfoState> {
|
||||
|
||||
final ServerInfoService _serverInfoService;
|
||||
|
||||
getServerInfo() {
|
||||
getServerVersion();
|
||||
getServerFeatures();
|
||||
getServerConfig();
|
||||
}
|
||||
|
||||
getServerVersion() async {
|
||||
ServerVersionResponseDto? serverVersion =
|
||||
await _serverInfoService.getServerVersion();
|
||||
@@ -66,6 +90,23 @@ class ServerInfoNotifier extends StateNotifier<ServerInfoState> {
|
||||
);
|
||||
}
|
||||
|
||||
getServerFeatures() async {
|
||||
ServerFeaturesDto? serverFeatures =
|
||||
await _serverInfoService.getServerFeatures();
|
||||
if (serverFeatures == null) {
|
||||
return;
|
||||
}
|
||||
state = state.copyWith(serverFeatures: serverFeatures);
|
||||
}
|
||||
|
||||
getServerConfig() async {
|
||||
ServerConfigDto? serverConfig = await _serverInfoService.getServerConfig();
|
||||
if (serverConfig == null) {
|
||||
return;
|
||||
}
|
||||
state = state.copyWith(serverConfig: serverConfig);
|
||||
}
|
||||
|
||||
Map<String, int> _getDetailVersion(String version) {
|
||||
List<String> detail = version.split(".");
|
||||
|
||||
|
||||
@@ -28,7 +28,25 @@ class ServerInfoService {
|
||||
try {
|
||||
return await _apiService.serverInfoApi.getServerVersion();
|
||||
} catch (e) {
|
||||
debugPrint("Error getting server info");
|
||||
debugPrint("Error [getServerVersion] ${e.toString()}");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
Future<ServerFeaturesDto?> getServerFeatures() async {
|
||||
try {
|
||||
return await _apiService.serverInfoApi.getServerFeatures();
|
||||
} catch (e) {
|
||||
debugPrint("Error [getServerFeatures] ${e.toString()}");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
Future<ServerConfigDto?> getServerConfig() async {
|
||||
try {
|
||||
return await _apiService.serverInfoApi.getServerConfig();
|
||||
} catch (e) {
|
||||
debugPrint("Error [getServerConfig] ${e.toString()}");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user