Skip to content

Commit

Permalink
fix dart fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Notsfsssf committed Apr 15, 2024
1 parent 5e6da05 commit 98c9728
Show file tree
Hide file tree
Showing 14 changed files with 42 additions and 42 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ android {
applicationId packageName
minSdkVersion 21
targetSdkVersion 34
versionCode 10009400
versionName "0.9.40 blur"
versionCode 10009410
versionName "0.9.41 blur"
ndk { abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64' }
}
compileOptions {
Expand Down
4 changes: 2 additions & 2 deletions lib/component/painer_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class PainterCard extends StatelessWidget {
}
return UsersPage(
id: user.user.id,
userStore: UserStore(user.user.id),
userStore: UserStore(user.user.id, null, user.user),
);
}));
},
Expand Down Expand Up @@ -141,7 +141,7 @@ class PainterCard extends StatelessWidget {
}
return UsersPage(
id: user.user.id,
userStore: UserStore(user.user.id),
userStore: UserStore(user.user.id, null, user.user),
heroTag: this.hashCode.toString(),
);
}));
Expand Down
2 changes: 1 addition & 1 deletion lib/constants.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import 'dart:io';

class Constants {
static String tagName = "0.9.40";
static String tagName = "0.9.41";
static const isGooglePlay =
bool.fromEnvironment("IS_GOOGLEPLAY", defaultValue: false);
static int type = 0;
Expand Down
4 changes: 2 additions & 2 deletions lib/fluent/component/painer_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class PainterCard extends StatelessWidget {
} else {
widget = UsersPage(
id: user.user.id,
userStore: UserStore(user.user.id),
userStore: UserStore(user.user.id, null, user.user),
);
}
Leader.push(context, widget,
Expand Down Expand Up @@ -91,7 +91,7 @@ class PainterCard extends StatelessWidget {
} else {
widget = UsersPage(
id: user.user.id,
userStore: UserStore(user.user.id),
userStore: UserStore(user.user.id, null, user.user),
heroTag: this.hashCode.toString(),
);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/fluent/page/picture/illust_items_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ abstract class IllustItemsPageState extends State<IllustItemsPage>

Widget buildNameAvatar(BuildContext context, Illusts illust) {
if (userStore == null)
userStore = UserStore(illust.user.id);
userStore = UserStore(illust.user.id, null, illust.user);
return Observer(builder: (_) {
Future.delayed(Duration(seconds: 2), () {
_loadAbout();
Expand Down
2 changes: 1 addition & 1 deletion lib/fluent/page/user/users_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class _UsersPageState extends State<UsersPage>

@override
void initState() {
userStore = widget.userStore ?? UserStore(widget.id);
userStore = widget.userStore ?? UserStore(widget.id, null, null);
_scrollController = ScrollController();
_scrollController.addListener(() {
if (_scrollController.hasClients) {
Expand Down
11 changes: 5 additions & 6 deletions lib/page/novel/user/novel_users_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class _NovelUsersPageState extends State<NovelUsersPage>
() => apiClient.getUserBookmarkNovel(widget.id, "public"),
EasyRefreshController(
controlFinishLoad: true, controlFinishRefresh: true));
userStore = widget.userStore ?? UserStore(widget.id);
userStore = widget.userStore ?? UserStore(widget.id, null, null);
userStore.firstFetch();
_tabController = TabController(length: 3, vsync: this);
_scrollController = ScrollController();
Expand Down Expand Up @@ -284,11 +284,10 @@ class _NovelUsersPageState extends State<NovelUsersPage>
final dio = Dio(BaseOptions(headers: Hoster.header(url: url)));
if (!userSetting.disableBypassSni) {
dio.httpClientAdapter = IOHttpClientAdapter()
..onHttpClientCreate = (client) {
client.badCertificateCallback =
(X509Certificate cert, String host, int port) => true;
return client;
};
..createHttpClient = () {
return HttpClient()
..badCertificateCallback =
(X509Certificate cert, String host, int port) => true;};
}
await dio.download(url.toTrueUrl(), tempFile, deleteOnError: true);
File file = File(tempFile);
Expand Down
2 changes: 1 addition & 1 deletion lib/page/picture/illust_detail_content.dart
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ class _IllustDetailContentState extends State<IllustDetailContent> {

Widget _buildNameAvatar(BuildContext context, Illusts illust) {
if (userStore == null)
userStore = UserStore(illust.user.id);
userStore = UserStore(illust.user.id, null, illust.user);
return Observer(builder: (_) {
return InkWell(
onTap: () async {
Expand Down
5 changes: 3 additions & 2 deletions lib/page/picture/illust_lighting_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ class _IllustVerticalPageState extends State<IllustVerticalPage>
),
),
);
if (userStore == null) userStore = UserStore(data.user.id);
if (userStore == null) userStore = UserStore(data.user.id, null, data.user);
return EasyRefresh(
controller: _refreshController,
header: PixezDefault.header(context),
Expand Down Expand Up @@ -754,7 +754,8 @@ class _IllustVerticalPageState extends State<IllustVerticalPage>
}

Widget _buildNameAvatar(BuildContext context, Illusts illust) {
if (userStore == null) userStore = UserStore(illust.user.id);
if (userStore == null)
userStore = UserStore(illust.user.id, null, illust.user);
return Observer(builder: (_) {
Future.delayed(Duration(seconds: 2), () {
_loadAbout();
Expand Down
4 changes: 2 additions & 2 deletions lib/page/picture/illust_row_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ class _IllustRowPageState extends State<IllustRowPage>
final screenHeight = MediaQuery.of(context).size.height;
final height = (radio * expectWidth);
final centerType = height <= screenHeight;
if (userStore == null) userStore = UserStore(data.user.id);
if (userStore == null) userStore = UserStore(data.user.id, null, data.user);
return GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () {
Expand Down Expand Up @@ -629,7 +629,7 @@ class _IllustRowPageState extends State<IllustRowPage>

Widget _buildNameAvatar(BuildContext context, Illusts illust) {
if (userStore == null)
userStore = UserStore(illust.user.id);
userStore = UserStore(illust.user.id, null, illust.user);
return Observer(builder: (_) {
Future.delayed(Duration(seconds: 2), () {
_loadAbout();
Expand Down
2 changes: 1 addition & 1 deletion lib/page/user/user_store.dart
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ abstract class _UserStoreBase with Store {
@observable
int value = 0;

_UserStoreBase(this.id) {
_UserStoreBase(this.id, this.userDetail, this.user) {
this.isFollow = user?.isFollowed ?? false;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/page/user/users_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class _UsersPageState extends State<UsersPage> with TickerProviderStateMixin {
_bookmarkStore = LightingStore(ApiForceSource(
futureGet: (e) =>
apiClient.getBookmarksIllust(widget.id, restrict, null)));
userStore = widget.userStore ?? UserStore(widget.id);
userStore = widget.userStore ?? UserStore(widget.id, null, null);
_tabController = TabController(length: 3, vsync: this);
_scrollController = ScrollController();
_scrollController.addListener(() {
Expand Down
28 changes: 14 additions & 14 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,10 @@ packages:
dependency: "direct main"
description:
name: dio
sha256: "639179e1cc0957779e10dd5b786ce180c477c4c0aca5aaba5d1700fa2e834801"
sha256: "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5"
url: "https://pub.dev"
source: hosted
version: "5.4.3"
version: "5.4.3+1"
dio_cache_interceptor:
dependency: "direct main"
description:
Expand Down Expand Up @@ -535,10 +535,10 @@ packages:
dependency: "direct main"
description:
name: flutter_mobx
sha256: "4a5d062ff85ed3759f4aac6410ff0ffae32e324b2e71ca722ae1b37b32e865f4"
sha256: "859fbf452fa9c2519d2700b125dd7fb14c508bbdd7fb65e26ca8ff6c92280e2e"
url: "https://pub.dev"
source: hosted
version: "2.2.0+2"
version: "2.2.1+1"
flutter_plugin_android_lifecycle:
dependency: transitive
description:
Expand All @@ -551,10 +551,10 @@ packages:
dependency: transitive
description:
name: flutter_riverpod
sha256: "4bce556b7ecbfea26109638d5237684538d4abc509d253e6c5c4c5733b360098"
sha256: "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d"
url: "https://pub.dev"
source: hosted
version: "2.4.10"
version: "2.5.1"
flutter_staggered_animations:
dependency: "direct main"
description:
Expand Down Expand Up @@ -689,10 +689,10 @@ packages:
dependency: "direct main"
description:
name: hooks_riverpod
sha256: "758b07eba336e3cbacbd81dba481f2228a14102083fdde07045e8514e8054c49"
sha256: "45b2030a18bcd6dbd680c2c91bc3b33e3fe7c323e3acb5ecec93a613e2fbaa8a"
url: "https://pub.dev"
source: hosted
version: "2.4.10"
version: "2.5.1"
html:
dependency: transitive
description:
Expand Down Expand Up @@ -985,18 +985,18 @@ packages:
dependency: "direct main"
description:
name: mobx
sha256: "74ee54012dc7c1b3276eaa960a600a7418ef5f9997565deb8fca1fd88fb36b78"
sha256: "63920b27b32ad1910adfe767ab1750e4c212e8923232a1f891597b362074ea5e"
url: "https://pub.dev"
source: hosted
version: "2.3.0+1"
version: "2.3.3+2"
mobx_codegen:
dependency: "direct dev"
description:
name: mobx_codegen
sha256: b26c7f9c20b38f0ea572c1ed3f29d8e027cb265538bbd1aed3ec198642cfca42
sha256: "8e0d8653a0c720ad933cd8358f6f89f740ce89203657c13f25bea772ef1fff7c"
url: "https://pub.dev"
source: hosted
version: "2.6.0+1"
version: "2.6.1"
msix:
dependency: "direct dev"
description:
Expand Down Expand Up @@ -1265,10 +1265,10 @@ packages:
dependency: transitive
description:
name: riverpod
sha256: "548e2192eb7aeb826eb89387f814edb76594f3363e2c0bb99dd733d795ba3589"
sha256: f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d
url: "https://pub.dev"
source: hosted
version: "2.5.0"
version: "2.5.1"
rxdart:
dependency: transitive
description:
Expand Down
12 changes: 6 additions & 6 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies:
sdk: flutter
flutter_localizations:
sdk: flutter
dio: ^5.4.3
dio: ^5.4.3+1
crypto: ^3.0.2
path_provider: ^2.1.3
shared_preferences: ^2.2.1
Expand All @@ -33,8 +33,8 @@ dependencies:
url_launcher: ^6.2.6
bot_toast: ^4.1.3
package_info_plus: ^7.0.0
mobx: ^2.1.4
flutter_mobx: ^2.0.6+5
mobx: ^2.3.3+2
flutter_mobx: ^2.2.1+1
in_app_purchase: ^3.1.7
flutter_widget_from_html: ^0.14.11
device_info_plus: ^10.1.0
Expand All @@ -60,8 +60,8 @@ dependencies:
http_interceptor: ^2.0.0-beta.8
image: ^4.1.4
easy_refresh: ^3.3.4
flutter_hooks: ^0.20.3
hooks_riverpod: ^2.4.8
flutter_hooks: ^0.20.5
hooks_riverpod: ^2.5.1
sqflite: ^2.3.3
dynamic_color: ^1.7.0
# Design Style
Expand All @@ -74,7 +74,7 @@ dev_dependencies:
flutter_test:
sdk: flutter
build_runner: ^2.4.9
mobx_codegen: ^2.1.1
mobx_codegen: ^2.6.1
json_serializable: ^6.6.1
analyzer: ^6.4.1
sqflite_common_ffi: ^2.3.3
Expand Down

0 comments on commit 98c9728

Please sign in to comment.