Compare commits

..

No commits in common. "6d0f62016a375b277685ff4a305f71362ce6c420" and "7508a54907ce7329f2af7b6094cfe848a73c1605" have entirely different histories.

3 changed files with 5 additions and 17 deletions

View File

@ -37,6 +37,7 @@ import 'package:flutter_web_plugins/url_strategy.dart' show usePathUrlStrategy;
import 'package:surface/widgets/dialog.dart'; import 'package:surface/widgets/dialog.dart';
import 'package:surface/widgets/version_label.dart'; import 'package:surface/widgets/version_label.dart';
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
await EasyLocalization.ensureInitialized(); await EasyLocalization.ensureInitialized();
@ -93,7 +94,7 @@ class SolianApp extends StatelessWidget {
Provider(create: (ctx) => HomeWidgetProvider(ctx)), Provider(create: (ctx) => HomeWidgetProvider(ctx)),
// Data layer // Data layer
Provider(create: (ctx) => SnNetworkProvider(ctx)), Provider(create: (_) => SnNetworkProvider()),
Provider(create: (ctx) => UserDirectoryProvider(ctx)), Provider(create: (ctx) => UserDirectoryProvider(ctx)),
Provider(create: (ctx) => SnAttachmentProvider(ctx)), Provider(create: (ctx) => SnAttachmentProvider(ctx)),
Provider(create: (ctx) => SnPostContentProvider(ctx)), Provider(create: (ctx) => SnPostContentProvider(ctx)),
@ -205,9 +206,6 @@ class _AppSplashScreenState extends State<_AppSplashScreen> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
if (MediaQuery.of(context).platformBrightness == Brightness.dark)
Image.asset("assets/icon/icon-dark.png", width: 64, height: 64)
else
Image.asset("assets/icon/icon.png", width: 64, height: 64), Image.asset("assets/icon/icon.png", width: 64, height: 64),
const Gap(6), const Gap(6),
LinearProgressIndicator( LinearProgressIndicator(

View File

@ -6,12 +6,9 @@ import 'dart:io';
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:dio_smart_retry/dio_smart_retry.dart'; import 'package:dio_smart_retry/dio_smart_retry.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:package_info_plus/package_info_plus.dart'; import 'package:package_info_plus/package_info_plus.dart';
import 'package:device_info_plus/device_info_plus.dart'; import 'package:device_info_plus/device_info_plus.dart';
import 'package:provider/provider.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:surface/providers/widget.dart';
import 'package:synchronized/synchronized.dart'; import 'package:synchronized/synchronized.dart';
const kAtkStoreKey = 'nex_user_atk'; const kAtkStoreKey = 'nex_user_atk';
@ -29,13 +26,10 @@ class SnNetworkProvider {
late final Dio client; late final Dio client;
late final SharedPreferences _prefs; late final SharedPreferences _prefs;
late final HomeWidgetProvider _home;
String? _userAgent; String? _userAgent;
SnNetworkProvider(BuildContext context) { SnNetworkProvider() {
_home = context.read<HomeWidgetProvider>();
client = Dio(); client = Dio();
client.interceptors.add(RetryInterceptor( client.interceptors.add(RetryInterceptor(
@ -69,8 +63,6 @@ class SnNetworkProvider {
SharedPreferences.getInstance().then((prefs) { SharedPreferences.getInstance().then((prefs) {
_prefs = prefs; _prefs = prefs;
client.options.baseUrl = _prefs.getString(kNetworkServerStoreKey) ?? kNetworkServerDefault; client.options.baseUrl = _prefs.getString(kNetworkServerStoreKey) ?? kNetworkServerDefault;
if (!context.mounted) return;
_home.saveWidgetData("server_url", client.options.baseUrl);
}); });
} }
@ -198,6 +190,5 @@ class SnNetworkProvider {
void setBaseUrl(String url) { void setBaseUrl(String url) {
client.options.baseUrl = url; client.options.baseUrl = url;
_home.saveWidgetData("server_url", client.options.baseUrl);
} }
} }

View File

@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 2.1.1+31 version: 2.0.1+30
environment: environment:
sdk: ^3.5.4 sdk: ^3.5.4
@ -138,7 +138,6 @@ flutter:
# To add assets to your application, add an assets section, like this: # To add assets to your application, add an assets section, like this:
assets: assets:
- assets/icon/icon.png - assets/icon/icon.png
- assets/icon/icon-dark.png
- assets/icon/icon-light-radius.png - assets/icon/icon-light-radius.png
- assets/translations/ - assets/translations/