refactor(mobile): tidy-up dependencies, remove unused, replace rarely used ones (#948)

This commit is contained in:
Fynn Petersen-Frey
2022-11-11 18:52:02 +01:00
committed by GitHub
parent 33ded2a174
commit 8d0ff974e1
13 changed files with 76 additions and 303 deletions

View File

@@ -1,7 +1,9 @@
import 'package:dio/dio.dart';
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:hive_flutter/hive_flutter.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:http/http.dart';
import 'package:immich_mobile/constants/hive_box.dart';
import 'package:immich_mobile/shared/views/version_announcement_overlay.dart';
@@ -9,21 +11,20 @@ class ReleaseInfoNotifier extends StateNotifier<String> {
ReleaseInfoNotifier() : super("");
void checkGithubReleaseInfo() async {
var dio = Dio();
final Client client = Client();
var box = Hive.box(hiveGithubReleaseInfoBox);
try {
String? localReleaseVersion = box.get(githubReleaseInfoKey);
var res = await dio.get(
"https://api.github.com/repos/alextran1502/immich/releases/latest",
options: Options(
headers: {"Accept": "application/vnd.github.v3+json"},
),
);
final res = await client.get(
Uri.parse(
"https://api.github.com/repos/alextran1502/immich/releases/latest",
),
headers: {"Accept": "application/vnd.github.v3+json"});
if (res.statusCode == 200) {
String latestTagVersion = res.data["tag_name"];
final data = jsonDecode(res.body);
String latestTagVersion = data["tag_name"];
state = latestTagVersion;
debugPrint("Local release version $localReleaseVersion");

View File

@@ -1,140 +0,0 @@
import 'dart:async';
import 'dart:convert';
import 'package:dio/dio.dart';
import 'package:flutter/cupertino.dart';
import 'package:hive/hive.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/constants/hive_box.dart';
import 'package:immich_mobile/utils/dio_http_interceptor.dart';
final networkServiceProvider = Provider((_) => NetworkService());
class NetworkService {
late final Dio dio;
NetworkService() {
dio = Dio();
dio.interceptors.add(AuthenticatedRequestInterceptor());
}
Future<dynamic> deleteRequest({required String url, dynamic data}) async {
try {
var savedEndpoint = Hive.box(userInfoBox).get(serverEndpointKey);
Response res = await dio.delete('$savedEndpoint/$url', data: data);
if (res.statusCode == 200) {
return res;
}
} on DioError catch (e) {
debugPrint("DioError: ${e.response}");
} catch (e) {
debugPrint("ERROR deleteRequest: ${e.toString()}");
}
}
Future<dynamic> getRequest({
required String url,
bool isByteResponse = false,
bool isStreamReponse = false,
}) async {
try {
var savedEndpoint = Hive.box(userInfoBox).get(serverEndpointKey);
if (isByteResponse) {
Response<List<int>> res = await dio.get<List<int>>(
'$savedEndpoint/$url',
options: Options(responseType: ResponseType.bytes),
);
if (res.statusCode == 200) {
return res;
}
} else if (isStreamReponse) {
Response<ResponseBody> res = await dio.get<ResponseBody>(
'$savedEndpoint/$url',
options: Options(responseType: ResponseType.stream),
);
if (res.statusCode == 200) {
return res;
}
} else {
Response res = await dio.get('$savedEndpoint/$url');
if (res.statusCode == 200) {
return res;
}
}
} on DioError catch (e) {
debugPrint("DioError: ${e.response}");
} catch (e) {
debugPrint("ERROR getRequest: ${e.toString()}");
}
}
Future<dynamic> postRequest({required String url, dynamic data}) async {
try {
var savedEndpoint = Hive.box(userInfoBox).get(serverEndpointKey);
var validUrl = Uri.parse('$savedEndpoint/$url').toString();
var res = await dio.post(validUrl, data: data);
return res;
} on DioError catch (e) {
debugPrint("[postRequest] DioError: ${e.response}");
return null;
} catch (e) {
debugPrint("ERROR PostRequest: $e");
return null;
}
}
Future<dynamic> putRequest({required String url, dynamic data}) async {
try {
var savedEndpoint = Hive.box(userInfoBox).get(serverEndpointKey);
var validUrl = Uri.parse('$savedEndpoint/$url').toString();
var res = await dio.put(validUrl, data: data);
return res;
} on DioError catch (e) {
debugPrint("DioError: ${e.response}");
return null;
} catch (e) {
debugPrint("ERROR PutRequest: $e");
return null;
}
}
Future<dynamic> patchRequest({required String url, dynamic data}) async {
try {
var savedEndpoint = Hive.box(userInfoBox).get(serverEndpointKey);
var validUrl = Uri.parse('$savedEndpoint/$url').toString();
var res = await dio.patch(validUrl, data: data);
return res;
} on DioError catch (e) {
debugPrint("DioError: ${e.response}");
} catch (e) {
debugPrint("ERROR PatchRequest: $e");
}
}
Future<bool> pingServer() async {
try {
var savedEndpoint = Hive.box(userInfoBox).get(serverEndpointKey);
var validUrl = Uri.parse('$savedEndpoint/server-info/ping').toString();
debugPrint("ping server at url $validUrl");
var res = await dio.get(validUrl);
var jsonRespsonse = jsonDecode(res.toString());
return jsonRespsonse["res"] == "pong";
} on DioError catch (e) {
debugPrint("[PING SERVER] DioError: ${e.response} - $e");
return false;
} catch (e) {
debugPrint("ERROR PingServer: $e");
return false;
}
}
}

View File

@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter_spinkit/flutter_spinkit.dart';
class ImmichLoadingIndicator extends StatelessWidget {
const ImmichLoadingIndicator({
@@ -15,10 +14,8 @@ class ImmichLoadingIndicator extends StatelessWidget {
color: Theme.of(context).primaryColor.withAlpha(200),
borderRadius: BorderRadius.circular(10),
),
child: const SpinKitDancingSquare(
color: Colors.white,
size: 30.0,
),
padding: const EdgeInsets.all(15),
child: const CircularProgressIndicator(color: Colors.white),
);
}
}