GitHub/proxypin
1
0
Fork 0
mirror of https://github.com/wanghongenpin/proxypin.git synced 2026-03-15 04:23:17 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix dark theme style

Browse Source
This commit is contained in:
wanghongenpin
2024-02-05 00:48:01 +08:00
parent a8fd8ca30b
commit 62e46b19bf
17 changed files with 38 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/network/components/request_block_manager.dart
View File

@@ -99,7 +99,7 @@ class RequestBlockItem {
//匹配url
bool match(String url, BlockType blockType) {
urlReg ??= RegExp(this.url.replaceAll("*", ".*"));
urlReg ??= RegExp('^${this.url.replaceAll("*", ".*")}');
return enabled && type == blockType && urlReg!.hasMatch(url);
}

4
lib/ui/desktop/desktop.dart
View File

@@ -207,7 +207,7 @@ class _DesktopHomePagePageState extends State<DesktopHomePage> implements EventL
'5. 支持高亮请求；\n'
'6. Android返回键进入小窗口；\n'
'7. Android白名单应用列表展示隐藏图标应用；\n'
'8. 修复websocket暗黑主题展示不清楚；\n'
'8. 修复暗黑主题样式；\n'
: 'Tips：By default, HTTPS packet capture will not be enabled. Please install the certificate before enabling HTTPS packet capture。\n'
'Click HTTPS Capture packets(Lock icon)，Choose to install the root certificate and follow the prompts to proceed。\n\n'
'1. History support auto cache time setting；\n'
@@ -217,7 +217,7 @@ class _DesktopHomePagePageState extends State<DesktopHomePage> implements EventL
'5. Support highlighting requests；\n'
'6. Android Return key to enter the small window；\n'
'7. Android Whitelist application list display hidden icon applications；\n'
'8. Fix websocket dark theme display unclear；\n',
'8. Fix dark theme style；\n',
style: const TextStyle(fontSize: 14)));
});
}

3
lib/ui/desktop/left/request_editor.dart
View File

@@ -588,7 +588,8 @@ class KeyValState extends State<KeyValWidget> with AutomaticKeepAliveClientMixin
contentPadding: const EdgeInsets.fromLTRB(5, 13, 5, 13),
focusedBorder: widget.readOnly
? null
: OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).primaryColor, width: 1.5)),
: OutlineInputBorder(
borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 1.5)),
border: InputBorder.none,
hintText: isKey ? "Key" : "Value")));
}

4
lib/ui/desktop/toolbar/setting/filter.dart
View File

@@ -279,9 +279,7 @@ class _DomainListState extends State<DomainList> {
child: Container(
padding: const EdgeInsets.only(top: 10),
height: 380,
decoration: BoxDecoration(
border: Border.all(color: Colors.grey.withOpacity(0.2)),
),
decoration: BoxDecoration(border: Border.all(color: Colors.grey.withOpacity(0.2))),
child: SingleChildScrollView(
child: Column(children: [
Row(

1
lib/ui/desktop/toolbar/setting/request_block.dart
View File

@@ -215,6 +215,7 @@ class RequestBlockAddDialog extends StatelessWidget {
(formKey.currentState as FormState).save();
item.enabled = enabled;
item.urlReg = null;
if (index != null) {
requestBlockManager.list[index!] = item;
} else {

7
lib/ui/desktop/toolbar/setting/request_rewrite.dart
View File

@@ -218,10 +218,7 @@ class _RequestRuleListState extends State<RequestRuleList> {
padding: const EdgeInsets.only(top: 10),
height: 500,
// constraints: const BoxConstraints(maxHeight: 500, minHeight: 350),
decoration: BoxDecoration(
border: Border.all(color: Colors.grey.withOpacity(0.2)),
color: Colors.white,
backgroundBlendMode: BlendMode.colorBurn),
decoration: BoxDecoration(border: Border.all(color: Colors.grey.withOpacity(0.2))),
child: SingleChildScrollView(
child: Column(children: [
Row(
@@ -637,6 +634,6 @@ class _RuleAddDialogState extends State<RuleAddDialog> {
}
InputBorder focusedBorder() {
return OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).primaryColor, width: 2));
return OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2));
}
}

4
lib/ui/desktop/toolbar/setting/rewrite/rewrite_replace.dart
View File

@@ -204,7 +204,7 @@ class _RewriteReplaceState extends State<RewriteReplaceDialog> {
: Container(
padding: const EdgeInsets.all(5),
foregroundDecoration:
BoxDecoration(border: Border.all(color: Theme.of(context).primaryColor, width: 1)),
BoxDecoration(border: Border.all(color: Theme.of(context).colorScheme.primary, width: 1)),
child: Text(item.bodyFile ?? ''))),
const SizedBox(width: 10),
FilledButton(
@@ -389,7 +389,7 @@ class _RewriteReplaceState extends State<RewriteReplaceDialog> {
}
InputBorder focusedBorder() {
return OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).primaryColor, width: 2));
return OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2));
}
}

9
lib/ui/desktop/toolbar/setting/rewrite/rewrite_update.dart
View File

@@ -203,7 +203,7 @@ class _RewriteUpdateAddState extends State<RewriteUpdateAddDialog> {
}
InputBorder focusedBorder() {
return OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).primaryColor, width: 2));
return OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2));
}
}
@@ -231,10 +231,7 @@ class _UpdateListState extends State<UpdateList> {
padding: const EdgeInsets.only(top: 10),
height: 320,
width: 550,
decoration: BoxDecoration(
border: Border.all(color: Colors.grey.withOpacity(0.2)),
color: Colors.white,
backgroundBlendMode: BlendMode.colorBurn),
decoration: BoxDecoration(border: Border.all(color: Colors.grey.withOpacity(0.2))),
child: SingleChildScrollView(
child: Column(children: [
Row(
@@ -254,7 +251,7 @@ class _UpdateListState extends State<UpdateList> {
int selected = -1;
List<Widget> rows(List<RewriteItem> list) {
var primaryColor = Theme.of(context).primaryColor;
var primaryColor = Theme.of(context).colorScheme.primary;
bool isCN = Localizations.localeOf(context) == const Locale.fromSubtags(languageCode: 'zh');
return List.generate(list.length, (index) {

8
lib/ui/desktop/toolbar/setting/script.dart
View File

@@ -137,9 +137,7 @@ class _ScriptWidgetState extends State<ScriptWidget> {
padding: const EdgeInsets.only(top: 10),
constraints: const BoxConstraints(maxHeight: 500, minHeight: 300),
decoration: BoxDecoration(
border: Border.all(color: Colors.grey.withOpacity(0.2)),
color: Colors.white,
backgroundBlendMode: BlendMode.colorBurn),
border: Border.all(color: Colors.grey.withOpacity(0.2))),
child: SingleChildScrollView(
child: Column(children: [
Row(
@@ -317,7 +315,7 @@ class _ScriptEditState extends State<ScriptEdit> {
}
InputBorder focusedBorder() {
return OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).primaryColor, width: 2));
return OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2));
}
}
@@ -343,7 +341,7 @@ class _ScriptListState extends State<ScriptList> {
}
List<Widget> rows(List<ScriptItem> list) {
var primaryColor = Theme.of(context).primaryColor;
var primaryColor = Theme.of(context).colorScheme.primary;
return List.generate(list.length, (index) {
return InkWell(

4
lib/ui/mobile/mobile.dart
View File

@@ -231,7 +231,7 @@ class MobileHomeState extends State<MobileHomePage> implements EventListener, Li
'4. 增加屏蔽请求功能；\n'
'5. Android返回键进入小窗口；\n'
'6. Android白名单应用列表展示隐藏图标应用；\n'
'7. 修复websocket暗黑主题展示不清楚；\n'
'7. 修复暗黑主题样式；\n'
: 'Tips：By default, HTTPS packet capture will not be enabled. Please install the certificate before enabling HTTPS packet capture。\n\n'
'1. History support auto cache time setting；\n'
'2. History Add Search;\n'
@@ -239,7 +239,7 @@ class MobileHomeState extends State<MobileHomePage> implements EventListener, Li
'4. Support blocking request；\n'
'5. Android Return key to enter the small window；\n'
'6. Android Whitelist application list display hidden icon applications；\n'
'7. Fix websocket dark theme display unclear；\n';
'7. Fix dark theme style；\n';
showAlertDialog(isCN ? '更新内容V1.0.8' : "Update content V1.0.8", content, () {
widget.appConfiguration.upgradeNoticeV8 = false;
widget.appConfiguration.flushConfig();

5
lib/ui/mobile/setting/filter.dart
View File

@@ -255,10 +255,7 @@ class _DomainListState extends State<DomainList> {
height: 50,
width: double.infinity,
margin: const EdgeInsets.only(top: 10),
decoration: BoxDecoration(
border: Border.all(color: Colors.grey.withOpacity(0.2)),
color: Colors.white,
backgroundBlendMode: BlendMode.colorBurn)),
decoration: BoxDecoration(border: Border.all(color: Colors.grey.withOpacity(0.2)))),
Positioned(
top: 0,
left: 0,

1
lib/ui/mobile/setting/request_block.dart
View File

@@ -215,6 +215,7 @@ class RequestBlockAddDialog extends StatelessWidget {
(formKey.currentState as FormState).save();
item.enabled = enabled;
item.urlReg = null;
if (index != null) {
requestBlockManager.list[index!] = item;
} else {

10
lib/ui/mobile/setting/request_rewrite.dart
View File

@@ -156,10 +156,7 @@ class _RequestRuleListState extends State<RequestRuleList> {
persistentFooterButtons: [multiple ? globalMenu() : const SizedBox()],
body: Container(
padding: const EdgeInsets.only(top: 10, bottom: 30),
decoration: BoxDecoration(
border: Border.all(color: Colors.grey.withOpacity(0.2)),
color: Colors.white,
backgroundBlendMode: BlendMode.colorBurn),
decoration: BoxDecoration(border: Border.all(color: Colors.grey.withOpacity(0.2))),
child: Scrollbar(
child: ListView(
children: [
@@ -185,10 +182,7 @@ class _RequestRuleListState extends State<RequestRuleList> {
height: 50,
width: double.infinity,
margin: const EdgeInsets.only(top: 10),
decoration: BoxDecoration(
border: Border.all(color: Colors.grey.withOpacity(0.2)),
color: Colors.white,
backgroundBlendMode: BlendMode.colorBurn)),
decoration: BoxDecoration(border: Border.all(color: Colors.grey.withOpacity(0.2)))),
Positioned(
top: 0,
left: 0,

5
lib/ui/mobile/setting/rewrite/rewrite_replace.dart
View File

@@ -214,7 +214,8 @@ class _RewriteReplaceState extends State<RewriteReplaceWidget> {
if (item.bodyFile != null)
Container(
padding: const EdgeInsets.all(8),
foregroundDecoration: BoxDecoration(border: Border.all(color: Theme.of(context).primaryColor, width: 1)),
foregroundDecoration:
BoxDecoration(border: Border.all(color: Theme.of(context).colorScheme.primary, width: 1)),
child: Text(item.bodyFile ?? ''))
]);
}
@@ -378,7 +379,7 @@ class _RewriteReplaceState extends State<RewriteReplaceWidget> {
}
InputBorder focusedBorder() {
return OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).primaryColor, width: 2));
return OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2));
}
}

9
lib/ui/mobile/setting/rewrite/rewrite_update.dart
View File

@@ -203,7 +203,7 @@ class _RewriteUpdateAddState extends State<RewriteUpdateAddDialog> {
}
InputBorder focusedBorder() {
return OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).primaryColor, width: 2));
return OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2));
}
}
@@ -231,10 +231,7 @@ class _UpdateListState extends State<UpdateList> {
padding: const EdgeInsets.only(top: 10),
height: 320,
width: 550,
decoration: BoxDecoration(
border: Border.all(color: Colors.grey.withOpacity(0.2)),
color: Colors.white,
backgroundBlendMode: BlendMode.colorBurn),
decoration: BoxDecoration(border: Border.all(color: Colors.grey.withOpacity(0.2))),
child: SingleChildScrollView(
child: Column(children: [
Row(
@@ -254,7 +251,7 @@ class _UpdateListState extends State<UpdateList> {
int selected = -1;
List<Widget> rows(List<RewriteItem> list) {
var primaryColor = Theme.of(context).primaryColor;
var primaryColor = Theme.of(context).colorScheme.primary;
return List.generate(list.length, (index) {
return InkWell(

9
lib/ui/mobile/setting/script.dart
View File

@@ -90,10 +90,7 @@ class _MobileScriptState extends State<MobileScript> {
Container(
padding: const EdgeInsets.only(top: 10),
constraints: const BoxConstraints(maxHeight: 500, minHeight: 300),
decoration: BoxDecoration(
border: Border.all(color: Colors.grey.withOpacity(0.2)),
color: Colors.white,
backgroundBlendMode: BlendMode.colorBurn),
decoration: BoxDecoration(border: Border.all(color: Colors.grey.withOpacity(0.2))),
child: SingleChildScrollView(
child: Column(children: [
Row(
@@ -264,7 +261,7 @@ class _ScriptEditState extends State<ScriptEdit> {
}
InputBorder focusedBorder() {
return OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).primaryColor, width: 2));
return OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2));
}
}
@@ -289,7 +286,7 @@ class _ScriptListState extends State<ScriptList> {
}
List<Widget> rows(List<ScriptItem> list) {
var primaryColor = Theme.of(context).primaryColor;
var primaryColor = Theme.of(context).colorScheme.primary;
return List.generate(list.length, (index) {
return InkWell(

13
test/tests.dart
View File

@@ -1,7 +1,6 @@
import 'dart:io';
void main() async {
// print(RegExp('http://dddd/hello\$').hasMatch("http://dddd/hello/world"));
print(RegExp('^www.baidu.com').hasMatch("https://www.baidu.com/wqeqweqe"));
String text = "http://dddd/hello/world?name=dad&val=12a";
print("mame=\$1123".replaceAll(RegExp('\\\$\\d'), "123"));
print("app: ddd".split(": "));
@@ -11,9 +10,9 @@ void main() async {
print(replaceAll);
return replaceAll;
}));
print(Platform.version);
print(Platform.localHostname);
print(Platform.operatingSystem);
print(Platform.localeName);
print(Platform.script);
// print(Platform.version);
// print(Platform.localHostname);
// print(Platform.operatingSystem);
// print(Platform.localeName);
// print(Platform.script);
}