Skip to content

Commit 23c89d6

Browse files
committed
style: improve incognito icon display in drawer
- Change the incognito icon in the drawer to have a circular background matching the primary theme color. - Add `enableCaching: true` and a monospace font family to code blocks in `DiscuzHtmlWidget`. - Ensure `ThreadSlideShowCarouselWidget` column uses `MainAxisSize.min`. - Add `hive_registrar.g.dart` to register Hive adapters.
1 parent 899c817 commit 23c89d6

File tree

5 files changed

+68
-2
lines changed

5 files changed

+68
-2
lines changed

lib/hive_registrar.g.dart

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
// Generated by Hive CE
2+
// Do not modify
3+
// Check in to version control
4+
5+
import 'package:hive_ce/hive.dart';
6+
import 'package:discuz_flutter/entity/BlockUser.dart';
7+
import 'package:discuz_flutter/entity/Discuz.dart';
8+
import 'package:discuz_flutter/entity/DiscuzAuthentication.dart';
9+
import 'package:discuz_flutter/entity/Draft.dart';
10+
import 'package:discuz_flutter/entity/FavoriteForumInDatabase.dart';
11+
import 'package:discuz_flutter/entity/FavoriteThreadInDatabase.dart';
12+
import 'package:discuz_flutter/entity/ImageAttachment.dart';
13+
import 'package:discuz_flutter/entity/Smiley.dart';
14+
import 'package:discuz_flutter/entity/TrustHost.dart';
15+
import 'package:discuz_flutter/entity/User.dart';
16+
import 'package:discuz_flutter/entity/ViewHistory.dart';
17+
import 'package:discuz_flutter/entity/ViewThreadCache.dart';
18+
import 'package:discuz_flutter/entity/ViewThreadScrollDistance.dart';
19+
20+
extension HiveRegistrar on HiveInterface {
21+
void registerAdapters() {
22+
registerAdapter(BlockUserAdapter());
23+
registerAdapter(DiscuzAdapter());
24+
registerAdapter(DiscuzAuthenticationAdapter());
25+
registerAdapter(DraftAdapter());
26+
registerAdapter(FavoriteForumInDatabaseAdapter());
27+
registerAdapter(FavoriteThreadInDatabaseAdapter());
28+
registerAdapter(ImageAttachmentAdapter());
29+
registerAdapter(SmileyAdapter());
30+
registerAdapter(TrustHostAdapter());
31+
registerAdapter(UserAdapter());
32+
registerAdapter(ViewHistoryAdapter());
33+
registerAdapter(ViewThreadCacheAdapter());
34+
registerAdapter(ViewThreadScrollDistanceAdapter());
35+
}
36+
}
37+
38+
extension IsolatedHiveRegistrar on IsolatedHiveInterface {
39+
void registerAdapters() {
40+
registerAdapter(BlockUserAdapter());
41+
registerAdapter(DiscuzAdapter());
42+
registerAdapter(DiscuzAuthenticationAdapter());
43+
registerAdapter(DraftAdapter());
44+
registerAdapter(FavoriteForumInDatabaseAdapter());
45+
registerAdapter(FavoriteThreadInDatabaseAdapter());
46+
registerAdapter(ImageAttachmentAdapter());
47+
registerAdapter(SmileyAdapter());
48+
registerAdapter(TrustHostAdapter());
49+
registerAdapter(UserAdapter());
50+
registerAdapter(ViewHistoryAdapter());
51+
registerAdapter(ViewThreadCacheAdapter());
52+
registerAdapter(ViewThreadScrollDistanceAdapter());
53+
}
54+
}

lib/page/DrawerPage.dart

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,15 @@ class DrawerState extends State<DrawerStatefulWidget> {
379379
elevation: _showUserDetail? 6 : 0,
380380
//padding: EdgeInsets.symmetric(vertical: 4, horizontal: 0),
381381
child: ListTile(
382-
leading: Icon(AppPlatformIcons(context).userIncognitoSolid, color: Theme.of(context).colorScheme.onPrimary),
382+
leading: ClipRRect(
383+
borderRadius: BorderRadius.circular(10000.0),
384+
clipBehavior: Clip.antiAlias,
385+
child: Container(
386+
padding: EdgeInsets.all(8),
387+
color: Theme.of(context).colorScheme.onPrimary,
388+
child: Icon(AppPlatformIcons(context).userIncognitoSolid, color: Theme.of(context).colorScheme.primary),
389+
),
390+
),
383391
title: Text(S.of(context).incognitoTitle, style: TextStyle(color: Theme.of(context).colorScheme.onPrimary)),
384392
subtitle: Text(S.of(context).incognitoSubtitle, style: TextStyle(color: Theme.of(context).colorScheme.onPrimary)),
385393
trailing: Icon(_showUserDetail? AppPlatformIcons(context).arrowUpRounded: AppPlatformIcons(context).arrowDownRounded, color: Theme.of(context).colorScheme.onPrimary),

lib/page/FavoriteForumPage.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ class FavoriteForumState extends State<FavoriteForumStatefulWidget>{
6262
_user = Provider.of<DiscuzAndUserNotifier>(context, listen: false).user;
6363
_discuz = Provider.of<DiscuzAndUserNotifier>(context, listen: false).discuz!;
6464
// check with local data
65+
6566
_loadDb();
6667

6768
}

lib/widget/DiscuzHtmlWidget.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ class DiscuzHtmlWidget extends StatelessWidget {
107107

108108
return HtmlWidget(
109109
PostTextUtils.getDecodedString(html, useCompactParagraph),
110+
enableCaching: true,
110111
onTapUrl: (url) {
111112
URLUtils.openURL(context, onSelectTid, url, callback, tid);
112113
return true;
@@ -157,7 +158,8 @@ class DiscuzHtmlWidget extends StatelessWidget {
157158
"background-color" : "#${Theme.of(context).colorScheme.secondaryContainer.value.toRadixString(16).substring(2)}",
158159
"color" : "#${Theme.of(context).colorScheme.onSecondaryContainer.value.toRadixString(16).substring(2)}",
159160
"padding" : "0.5em",
160-
"margin-bottom": "0.1em"
161+
"margin-bottom": "0.1em",
162+
"font-family": "monospace",
161163
};
162164
}
163165
return null;

lib/widget/ThreadSlideShowCarouselWidget.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ class ThreadSlideShowCarouselState extends State<ThreadSlideShowCarouselStateful
241241

242242
return InkWell(
243243
child: Column(
244+
mainAxisSize: MainAxisSize.min,
244245
children: [
245246
Container(
246247
height: slideHeight,

0 commit comments

Comments
 (0)