Skip to content

Commit bb112f6

Browse files
Update version 1.2.0
1 parent 1df59d7 commit bb112f6

File tree

66 files changed

+43
-6100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+43
-6100
lines changed

lib/Screens/Navigation/community_screen.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ class CommunityScreenState extends State<CommunityScreen>
6464
TabItemDataList tabDataList = TabItemDataList([]);
6565

6666
int get currentIndex => _tabController.index;
67-
ViewConfig viewConfig =
68-
ViewConfig.fromJson(HiveUtil.getMap(HiveUtil.communityViewConfigKey) ?? {});
67+
ViewConfig viewConfig = ViewConfig.fromJson(
68+
HiveUtil.getMap(HiveUtil.communityViewConfigKey) ?? {});
6969

7070
Map<String, TabItemData> idToListFlowMap = {};
7171

lib/Screens/Setting/setting_filter_screen.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ class _FilterSettingScreenState extends State<FilterSettingScreen>
108108
builder: (context, enableFilterContent, child) {
109109
if (enableFilterContent) {
110110
return Selector<AppProvider, String>(
111-
selector: (context, appProvider) => appProvider.filterContentRegExp,
111+
selector: (context, appProvider) =>
112+
appProvider.filterContentRegExp,
112113
builder: (context, filterContent, child) =>
113114
ItemBuilder.buildEntryItem(
114115
context: context,
@@ -171,7 +172,7 @@ class _FilterSettingScreenState extends State<FilterSettingScreen>
171172
BottomSheetBuilder.showBottomSheet(
172173
context,
173174
responsive: true,
174-
(context) => InputBottomSheet(
175+
(context) => InputBottomSheet(
175176
title: "设置过滤关键词",
176177
message: "支持正则表达式,留空则忽略",
177178
text: filterUser,

lib/Utils/app_provider.dart

+4-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@ class AppProvider with ChangeNotifier {
185185
notifyListeners();
186186
}
187187

188-
String _filterContentRegExp = HiveUtil.getString(HiveUtil.filterContentRegExpKey) ?? "";
188+
String _filterContentRegExp =
189+
HiveUtil.getString(HiveUtil.filterContentRegExpKey) ?? "";
189190

190191
String get filterContentRegExp => _filterContentRegExp;
191192

@@ -205,7 +206,8 @@ class AppProvider with ChangeNotifier {
205206
notifyListeners();
206207
}
207208

208-
String _filterUserRegExp = HiveUtil.getString(HiveUtil.filterUserRegExpKey) ?? "";
209+
String _filterUserRegExp =
210+
HiveUtil.getString(HiveUtil.filterUserRegExpKey) ?? "";
209211

210212
String get filterUserRegExp => _filterUserRegExp;
211213

lib/Widgets/Scaffold/my_tooltip.dart

+3-1
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ class MyTooltip extends StatefulWidget {
206206
);
207207

208208
final TooltipPosition position;
209+
209210
/// The text to display in the tooltip.
210211
///
211212
/// Only one of [message] and [richMessage] may be non-null.
@@ -434,7 +435,8 @@ class MyTooltip extends StatefulWidget {
434435
///
435436
/// This class can be used to programmatically show the Tooltip, see the
436437
/// [ensureTooltipVisible] method.
437-
class MyTooltipState extends State<MyTooltip> with SingleTickerProviderStateMixin {
438+
class MyTooltipState extends State<MyTooltip>
439+
with SingleTickerProviderStateMixin {
438440
static const double _defaultVerticalOffset = 24.0;
439441
static const bool _defaultPreferBelow = true;
440442
static const EdgeInsetsGeometry _defaultMargin = EdgeInsets.zero;

lib/Widgets/Twitter/post_item.dart

+28-24
Original file line numberDiff line numberDiff line change
@@ -651,24 +651,24 @@ class PostItemState extends State<PostItem> with AutomaticKeepAliveClientMixin {
651651
User user = userResultUnion as User;
652652
double avatarSize = 40;
653653
BorderRadius borderRadius = BorderRadius.zero;
654-
if (ResponsiveUtil.isLandscape()) {
655-
if (isFirst) {
656-
borderRadius = borderRadius
657-
.add(const BorderRadius.only(
658-
topLeft: Radius.circular(8),
659-
topRight: Radius.circular(8),
660-
))
661-
.resolve(null);
662-
}
663-
if (isLast) {
664-
borderRadius = borderRadius
665-
.add(const BorderRadius.only(
666-
bottomLeft: Radius.circular(8),
667-
bottomRight: Radius.circular(8),
668-
))
669-
.resolve(null);
670-
}
671-
}
654+
// if (ResponsiveUtil.isLandscape()) {
655+
// if (isFirst) {
656+
// borderRadius = borderRadius
657+
// .add(const BorderRadius.only(
658+
// topLeft: Radius.circular(8),
659+
// topRight: Radius.circular(8),
660+
// ))
661+
// .resolve(null);
662+
// }
663+
// if (isLast) {
664+
// borderRadius = borderRadius
665+
// .add(const BorderRadius.only(
666+
// bottomLeft: Radius.circular(8),
667+
// bottomRight: Radius.circular(8),
668+
// ))
669+
// .resolve(null);
670+
// }
671+
// }
672672
var body = Container(
673673
padding: const EdgeInsets.symmetric(horizontal: 8).add(
674674
EdgeInsets.only(
@@ -955,7 +955,7 @@ class PostItemState extends State<PostItem> with AutomaticKeepAliveClientMixin {
955955
);
956956
} else {
957957
mainWidget = Column(
958-
crossAxisAlignment: CrossAxisAlignment.center,
958+
crossAxisAlignment: CrossAxisAlignment.start,
959959
children: [
960960
imageWidget,
961961
contentWidget,
@@ -975,6 +975,7 @@ class PostItemState extends State<PostItem> with AutomaticKeepAliveClientMixin {
975975
onLongPress: ResponsiveUtil.isDesktop() ? null : showContextMenu,
976976
onSecondaryTap: ResponsiveUtil.isDesktop() ? showContextMenu : null,
977977
child: Container(
978+
constraints: const BoxConstraints(maxWidth: maxMediaOrQuoteWidth),
978979
decoration: BoxDecoration(
979980
borderRadius: BorderRadius.circular(8),
980981
border: MyTheme.border,
@@ -994,14 +995,15 @@ class PostItemState extends State<PostItem> with AutomaticKeepAliveClientMixin {
994995
},
995996
child: Container(
996997
decoration: BoxDecoration(
997-
color: Theme.of(context).cardColor,
998+
color: MyTheme.canvasColor,
998999
borderRadius: BorderRadius.circular(8),
1000+
border: MyTheme.divider,
9991001
),
10001002
padding: const EdgeInsets.all(8),
10011003
margin: const EdgeInsets.symmetric(vertical: 4),
10021004
child: Text(
10031005
tweet.isExpanded ? "收起全文" : "查看全文",
1004-
style: MyTheme.bodyMedium!.apply(
1006+
style: MyTheme.bodyMedium.apply(
10051007
color: MyColors.getLinkColor(context),
10061008
fontWeightDelta: 2,
10071009
),
@@ -1022,11 +1024,11 @@ class PostItemState extends State<PostItem> with AutomaticKeepAliveClientMixin {
10221024
alignment: Alignment.center,
10231025
decoration: BoxDecoration(
10241026
borderRadius: BorderRadius.circular(8),
1025-
border: Border.all(color: Theme.of(context).dividerColor, width: 0.5),
1027+
border: MyTheme.divider,
10261028
),
10271029
padding: const EdgeInsets.all(12),
10281030
child: Text("这个引用的帖子不可用",
1029-
style: MyTheme.bodySmall?.apply(fontSizeDelta: 3)),
1031+
style: MyTheme.bodySmall.apply(fontSizeDelta: 3)),
10301032
);
10311033
} else {
10321034
Article? article = tweet.article;
@@ -1074,6 +1076,7 @@ class PostItemState extends State<PostItem> with AutomaticKeepAliveClientMixin {
10741076
if (hasText)
10751077
Expanded(
10761078
child: Column(
1079+
crossAxisAlignment: CrossAxisAlignment.start,
10771080
children: [
10781081
if (article != null)
10791082
Row(
@@ -1146,8 +1149,9 @@ class PostItemState extends State<PostItem> with AutomaticKeepAliveClientMixin {
11461149
return [
11471150
Container(
11481151
decoration: BoxDecoration(
1149-
color: Theme.of(context).cardColor,
1152+
color: MyTheme.canvasColor,
11501153
borderRadius: BorderRadius.circular(8),
1154+
border: MyTheme.divider,
11511155
),
11521156
padding: const EdgeInsets.all(8),
11531157
child: Column(

pubspec.lock

-7
Original file line numberDiff line numberDiff line change
@@ -1623,13 +1623,6 @@ packages:
16231623
url: "https://pub.flutter-io.cn"
16241624
source: hosted
16251625
version: "1.1.0"
1626-
swagger_parser:
1627-
dependency: "direct dev"
1628-
description:
1629-
path: "third-party/tool/swagger_parser"
1630-
relative: true
1631-
source: path
1632-
version: "1.19.1"
16331626
synchronized:
16341627
dependency: transitive
16351628
description:

pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: twitee
2-
version: 1.1.0+110
2+
version: 1.2.0+120
33
description: An awesome two-factor authenticator which supports cloud storage and multiple platforms.
44
publish_to: none
55

@@ -124,8 +124,8 @@ dev_dependencies:
124124
# OpenAPI
125125
json_serializable: ^6.7.1
126126
freezed: ^2.5.7
127-
swagger_parser:
128-
path: third-party/tool/swagger_parser
127+
# swagger_parser:
128+
# path: third-party/tool/swagger_parser
129129
retrofit_generator: ^9.1.2
130130

131131
swagger_parser:

third-party/tool/swagger_parser/.gitignore

-9
This file was deleted.

third-party/tool/swagger_parser/.pubignore

-7
This file was deleted.

0 commit comments

Comments
 (0)