Compare commits

...

43 Commits

Author SHA1 Message Date
chen08209
0512d692f2 Fix notification duplicate creation issue
Fix AccessControl click issue
2024-06-03 11:43:41 +08:00
chen08209
844ce8ffb0 Fix Linux unable to open 2024-05-31 22:12:06 +08:00
chen08209
d2588596df Update README.md 3 2024-05-31 15:40:47 +08:00
chen08209
0e999e3deb Create LICENSE
(cherry picked from commit 3ef3190785)
2024-05-31 15:11:45 +08:00
chen08209
8109bbf46c Update README.md 2
(cherry picked from commit b1c763fcfa)
2024-05-31 15:11:45 +08:00
chen08209
32ea45e5ea Update README.md
(cherry picked from commit 9452ffa514)
2024-05-31 15:11:44 +08:00
chen08209
ecce17ad75 optimize checkUpdate 2024-05-31 09:59:18 +08:00
chen08209
96738090cf Fix submit error
(cherry picked from commit fd3040283c)
2024-05-31 09:09:05 +08:00
chen08209
4a8ea37142 add WebDAV
add Auto check updates

Optimize more details
2024-05-30 17:06:53 +08:00
chen08209
a5fdb90da5 optimize delayTest 2024-05-17 19:54:26 +08:00
chen08209
f9722cc761 upgrade flutter version
(cherry picked from commit 9a07c785f2)
2024-05-17 09:35:22 +08:00
chen08209
f01fb2ed1d Update kernel
Add import profile via QR code image
2024-05-15 20:19:50 +08:00
chen08209
74f4481071 Add compatibility mode and adapt clash scheme. 2024-05-11 14:08:13 +08:00
chen08209
9018f512ae Reconstruction application proxy logic 2024-05-07 17:59:11 +08:00
chen08209
265fc4a701 Fix Tab destroy error 2024-05-06 19:03:49 +08:00
chen08209
755974fc9e Optimize repeat healthcheck 2024-05-06 17:15:42 +08:00
chen08209
ba8eab4fc9 Optimize Direct mode ui 2024-05-06 15:26:38 +08:00
chen08209
f5cb46710f Optimize Healthcheck 2024-05-06 14:31:20 +08:00
chen08209
6483e80416 Remove proxies position animation, improve performance
Add Telegram Link
2024-05-06 14:31:19 +08:00
chen08209
535e6dc3a5 Update healthcheck policy 2024-05-06 14:31:19 +08:00
chen08209
ad86c20cfb New Check URLTest 2024-05-05 21:40:12 +08:00
chen08209
665330e17a Fix the problem of invalid auto-selection 2024-05-05 16:13:52 +08:00
chen08209
0eb001e717 New Async UpdateConfig 2024-05-05 03:12:45 +08:00
chen08209
a563991d74 add changeProfileDebounce 2024-05-04 21:51:40 +08:00
chen08209
3e2a30008c Update Workflow 2024-05-04 16:50:37 +08:00
chen08209
ff68d573d6 Fix ChangeProfile block 2024-05-04 16:39:21 +08:00
chen08209
3223fca7ba Fix Release Message Error
(cherry picked from commit aef50fe0e3)
2024-05-04 16:38:03 +08:00
chen08209
006f9127fc Update Selector 2
(cherry picked from commit fc0767ed25)
2024-05-04 16:37:59 +08:00
chen08209
a2709e155c Update Version
(cherry picked from commit dbf1724cca)
2024-05-04 16:37:57 +08:00
chen08209
684fa7b58e Fix Proxies Select Error
(cherry picked from commit 909aa4038e)
2024-05-04 16:37:55 +08:00
chen08209
03b4da54b5 Fix the problem that the proxy group is empty in global mode.
(cherry picked from commit 2d0a7d8d46)
2024-05-04 16:37:54 +08:00
chen08209
a904b55d11 Fix the problem that the proxy group is empty in global mode.
(cherry picked from commit ca96cd1d82)
2024-05-04 16:37:54 +08:00
chen08209
d711935e2e Add ProxyProvider2
(cherry picked from commit 91ab1e5dac)
2024-05-04 16:37:53 +08:00
chen08209
98b1496eff Add ProxyProvider
(cherry picked from commit b3a5f74df8)
2024-05-03 21:28:41 +08:00
chen08209
442c32b6eb Update Version 2024-05-03 15:32:12 +08:00
chen08209
949a2aaac3 Update ProxyGroup Sort 2024-05-03 14:31:10 +08:00
chen08209
c77463f337 Fix Android quickStart VpnService some problems 2024-05-02 00:46:42 +08:00
chen08209
00377d6070 Update version 2024-05-01 23:39:21 +08:00
chen08209
f393b4b3e9 Set Android notification low importance 2024-05-01 23:29:32 +08:00
chen08209
75e6cfde15 Add Telegram in README_zh_CN.md
(cherry picked from commit 8a188a37c9)
2024-05-01 21:52:22 +08:00
chen08209
7bfe5617d9 Add Telegram 2024-05-01 21:49:18 +08:00
chen08209
97cc96c243 Fix the issue that VpnService can't be closed correctly in special cases 2024-05-01 21:29:54 +08:00
chen08209
1821ee2f61 Fix the problem that TileService is not destroyed correctly in some cases
Adjust tab animation defaults
2024-05-01 15:13:09 +08:00
112 changed files with 6846 additions and 2629 deletions

View File

@@ -89,7 +89,7 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
submodules: recursive fetch-depth: 0
- name: Download - name: Download
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
@@ -101,13 +101,13 @@ jobs:
- name: Pre Release - name: Pre Release
run: | run: |
pip install gitchangelog pystache mustache markdown pip install gitchangelog pystache mustache markdown
prelease=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "") pre=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
if [ -z "$prelease" ]; then if [ -z "pre" ]; then
echo "init" > release.md echo "init" > release.md
else else
current="${{ github.ref_name }}" current="${{ github.ref_name }}"
echo -e "\n\n<details markdown=1><summary>All changes from $current to the latest commit:</summary>\n\n" >> release.md echo -e "\n\n<details markdown=1><summary>All changes from $current to the latest commit:</summary>\n\n" >> release.md
gitchangelog "${prelease}.." >> release.md 2>&1 || echo "Error in gitchangelog" gitchangelog "${pre}.." >> release.md 2>&1 || echo "Error in gitchangelog"
echo -e "\n\n</details>" >> release.md echo -e "\n\n</details>" >> release.md
fi fi
- name: Release - name: Release

674
LICENSE Normal file
View File

@@ -0,0 +1,674 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.

View File

@@ -6,16 +6,24 @@
## FlClash ## FlClash
<p style="text-align: left;">
<img alt="stars" src="https://img.shields.io/github/stars/chen08209/FlClash?style=flat-square&logo=github"/>
<img alt="downloads" src="https://img.shields.io/github/downloads/chen08209/FlClash/total"/>
<a href="LICENSE">
<img alt="license" src="https://img.shields.io/github/license/chen08209/FlClash"/>
</a>
</p>
A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free. A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
on Desktop: on Desktop:
<p style="text-align: center;"> <p style="text-align: center;">
<img src="snapshots/desktop.gif"> <img alt="desktop" src="snapshots/desktop.gif">
</p> </p>
on Mobile: on Mobile:
<p style="text-align: center;"> <p style="text-align: center;">
<img src="snapshots/mobile.gif"> <img alt="mobile" src="snapshots/mobile.gif">
</p> </p>
## Features ## Features
@@ -28,6 +36,10 @@ on Mobile:
✨ Support subscription link, Dark mode ✨ Support subscription link, Dark mode
## Contact
[Telegram](https://t.me/+G-veVtwBOl4wODc1)
## Build ## Build
1. Update submodules 1. Update submodules
@@ -81,4 +93,17 @@ on Mobile:
```bash ```bash
dart .\setup.dart dart .\setup.dart
``` ```
## Star
The easiest way to support developers is to click on the star (⭐) at the top of the page.
<p style="text-align: center;">
<a href="https://api.star-history.com/svg?repos=chen08209/FlClash&Date">
<img alt="start" width=50% src="https://api.star-history.com/svg?repos=chen08209/FlClash&Date"/>
</a>
</p>

View File

@@ -6,16 +6,24 @@
## FlClash ## FlClash
<p style="text-align: left;">
<img alt="stars" src="https://img.shields.io/github/stars/chen08209/FlClash?style=flat-square&logo=github"/>
<img alt="downloads" src="https://img.shields.io/github/downloads/chen08209/FlClash/total"/>
<a href="LICENSE">
<img alt="license" src="https://img.shields.io/github/license/chen08209/FlClash"/>
</a>
</p>
基于ClashMeta的多平台代理客户端简单易用开源无广告。 基于ClashMeta的多平台代理客户端简单易用开源无广告。
on Desktop: on Desktop:
<p style="text-align: center;"> <p style="text-align: center;">
<img src="snapshots/desktop.gif"> <img alt="desktop" src="snapshots/desktop.gif">
</p> </p>
on Mobile: on Mobile:
<p style="text-align: center;"> <p style="text-align: center;">
<img src="snapshots/mobile.gif"> <img alt="mobile" src="snapshots/mobile.gif">
</p> </p>
## Features ## Features
@@ -28,6 +36,10 @@ on Mobile:
✨ 支持一键导入订阅, 深色模式 ✨ 支持一键导入订阅, 深色模式
## Contact
[Telegram](https://t.me/+G-veVtwBOl4wODc1)
## Build ## Build
1. 更新 submodules 1. 更新 submodules
@@ -81,4 +93,14 @@ on Mobile:
```bash ```bash
dart .\setup.dart dart .\setup.dart
``` ```
## Star History
支持开发者的最简单方式是点击页面顶部的星标(⭐)。
<p style="text-align: center;">
<a href="https://api.star-history.com/svg?repos=chen08209/FlClash&Date">
<img alt="start" width=50% src="https://api.star-history.com/svg?repos=chen08209/FlClash&Date"/>
</a>
</p>

View File

@@ -23,6 +23,7 @@
<application <application
android:name="${applicationName}" android:name="${applicationName}"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:networkSecurityConfig="@xml/network_security_config"
android:label="FlClash"> android:label="FlClash">
<activity <activity
android:name="com.follow.clash.MainActivity" android:name="com.follow.clash.MainActivity"

View File

@@ -10,6 +10,7 @@ import io.flutter.embedding.engine.FlutterEngine
class MainActivity : FlutterActivity() { class MainActivity : FlutterActivity() {
override fun configureFlutterEngine(flutterEngine: FlutterEngine) { override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
GlobalState.flutterEngine?.destroy()
super.configureFlutterEngine(flutterEngine) super.configureFlutterEngine(flutterEngine)
flutterEngine.plugins.add(AppPlugin()) flutterEngine.plugins.add(AppPlugin())
flutterEngine.plugins.add(ProxyPlugin()) flutterEngine.plugins.add(ProxyPlugin())

View File

@@ -52,6 +52,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) { override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
channel.setMethodCallHandler(null) channel.setMethodCallHandler(null)
} }
private fun tip(message: String?) { private fun tip(message: String?) {
if (toast != null) { if (toast != null) {
toast!!.cancel() toast!!.cancel()
@@ -146,9 +147,9 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
val packageManager = context?.packageManager val packageManager = context?.packageManager
val packages: List<Package>? = val packages: List<Package>? =
packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter { packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
it.packageName == context?.packageName it.packageName != context?.packageName
|| it.requestedPermissions?.contains(Manifest.permission.INTERNET) == false || it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
|| it.packageName != "android" || it.packageName == "android"
}?.map { }?.map {
Package( Package(

View File

@@ -37,14 +37,12 @@ class FlClashTileService : TileService() {
} }
} }
override fun onStartListening() { override fun onStartListening() {
super.onStartListening() super.onStartListening()
GlobalState.runState.value?.let { updateTile(it) } GlobalState.runState.value?.let { updateTile(it) }
GlobalState.runState.observeForever(observer) GlobalState.runState.observeForever(observer)
} }
@SuppressLint("StartActivityAndCollapseDeprecated") @SuppressLint("StartActivityAndCollapseDeprecated")
private fun activityTransfer() { private fun activityTransfer() {
val intent = Intent(this, TempActivity::class.java) val intent = Intent(this, TempActivity::class.java)
@@ -88,7 +86,7 @@ class FlClashTileService : TileService() {
if(currentTilePlugin == null){ if(currentTilePlugin == null){
initFlutterEngine() initFlutterEngine()
}else{ }else{
currentTilePlugin?.handleStart() currentTilePlugin.handleStart()
} }
} else if(GlobalState.runState.value == RunState.START){ } else if(GlobalState.runState.value == RunState.START){
GlobalState.runState.value = RunState.PENDING GlobalState.runState.value = RunState.PENDING
@@ -97,7 +95,6 @@ class FlClashTileService : TileService() {
} }
override fun onDestroy() { override fun onDestroy() {
GlobalState.runState.removeObserver(observer) GlobalState.runState.removeObserver(observer)
super.onDestroy() super.onDestroy()

View File

@@ -13,6 +13,7 @@ import android.os.Binder
import android.os.Build import android.os.Build
import android.os.IBinder import android.os.IBinder
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE
import androidx.core.graphics.drawable.IconCompat import androidx.core.graphics.drawable.IconCompat
import com.follow.clash.GlobalState import com.follow.clash.GlobalState
import com.follow.clash.MainActivity import com.follow.clash.MainActivity
@@ -20,12 +21,14 @@ import com.follow.clash.models.AccessControl
import com.follow.clash.models.AccessControlMode import com.follow.clash.models.AccessControlMode
@SuppressLint("WrongConstant")
class FlClashVpnService : VpnService() { class FlClashVpnService : VpnService() {
private val CHANNEL = "FlClash" private val CHANNEL = "FlClash"
var fd: Int? = null; var fd: Int? = null
private val notificationId: Int = 1
private val passList = listOf( private val passList = listOf(
"*zhihu.com", "*zhihu.com",
@@ -96,48 +99,60 @@ class FlClashVpnService : VpnService() {
stopForeground() stopForeground()
} }
private val notificationBuilder by lazy {
val intent = Intent(this, MainActivity::class.java)
val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
PendingIntent.getActivity(
this,
0,
intent,
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
)
} else {
PendingIntent.getActivity(
this,
0,
intent,
PendingIntent.FLAG_UPDATE_CURRENT
)
}
val icon = IconCompat.createWithResource(this, this.applicationInfo.icon)
with(NotificationCompat.Builder(this, CHANNEL)) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
setSmallIcon(icon)
}
setContentTitle("FlClash")
foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
setContentIntent(pendingIntent)
setCategory(NotificationCompat.CATEGORY_SERVICE)
priority = NotificationCompat.PRIORITY_LOW
setOngoing(true)
setShowWhen(false)
setOnlyAlertOnce(true)
}
}
@SuppressLint("ForegroundServiceType", "WrongConstant") @SuppressLint("ForegroundServiceType", "WrongConstant")
fun startForeground(title: String, content: String) { fun startForeground(title: String, content: String) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
val channel = val channel =
NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_DEFAULT) NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
val manager = getSystemService(NotificationManager::class.java) val manager = getSystemService(NotificationManager::class.java)
manager.createNotificationChannel(channel) manager.createNotificationChannel(channel)
}
val intent = Intent(this, MainActivity::class.java) val notification =
val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { notificationBuilder.setContentTitle(title).setContentText(content).build()
PendingIntent.getActivity( if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
this, startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
0, } else {
intent, startForeground(notificationId, notification)
PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
)
} else {
PendingIntent.getActivity(
this,
0,
intent,
PendingIntent.FLAG_UPDATE_CURRENT
)
}
val icon = IconCompat.createWithResource(this, this.applicationInfo.icon)
val notification = with(NotificationCompat.Builder(this, CHANNEL)) {
setSmallIcon(icon)
setContentTitle(title)
setContentText(content)
foregroundServiceBehavior = NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE
setContentIntent(pendingIntent)
setOngoing(true)
setShowWhen(false)
build()
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
startForeground(1, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
} else {
startForeground(1, notification)
}
} }
} }
private fun stopForeground() { private fun stopForeground() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
stopForeground(Service.STOP_FOREGROUND_REMOVE) stopForeground(Service.STOP_FOREGROUND_REMOVE)

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AcceptsUserCertificates">
<base-config>
<trust-anchors>
<certificates src="system" />
<certificates src="user" />
</trust-anchors>
</base-config>
</network-security-config>

View File

@@ -3,25 +3,67 @@ package main
import "C" import "C"
import ( import (
"github.com/metacubex/mihomo/adapter/inbound" "github.com/metacubex/mihomo/adapter/inbound"
ap "github.com/metacubex/mihomo/adapter/provider"
"github.com/metacubex/mihomo/component/dialer" "github.com/metacubex/mihomo/component/dialer"
"github.com/metacubex/mihomo/component/process" "github.com/metacubex/mihomo/component/process"
"github.com/metacubex/mihomo/component/resolver" "github.com/metacubex/mihomo/component/resolver"
"github.com/metacubex/mihomo/config" "github.com/metacubex/mihomo/config"
"github.com/metacubex/mihomo/constant/provider"
"github.com/metacubex/mihomo/dns" "github.com/metacubex/mihomo/dns"
"github.com/metacubex/mihomo/hub/executor" "github.com/metacubex/mihomo/hub/executor"
"github.com/metacubex/mihomo/listener" "github.com/metacubex/mihomo/listener"
"github.com/metacubex/mihomo/log" "github.com/metacubex/mihomo/log"
"github.com/metacubex/mihomo/tunnel" "github.com/metacubex/mihomo/tunnel"
"math"
"os" "os"
"os/exec" "os/exec"
"path/filepath"
"runtime" "runtime"
"strings"
"sync"
"syscall" "syscall"
) )
type healthCheckSchema struct {
Enable bool `provider:"enable"`
URL string `provider:"url"`
Interval int `provider:"interval"`
TestTimeout int `provider:"timeout,omitempty"`
Lazy bool `provider:"lazy,omitempty"`
ExpectedStatus string `provider:"expected-status,omitempty"`
}
type proxyProviderSchema struct {
Type string `provider:"type"`
Path string `provider:"path,omitempty"`
URL string `provider:"url,omitempty"`
Proxy string `provider:"proxy,omitempty"`
Interval int `provider:"interval,omitempty"`
Filter string `provider:"filter,omitempty"`
ExcludeFilter string `provider:"exclude-filter,omitempty"`
ExcludeType string `provider:"exclude-type,omitempty"`
DialerProxy string `provider:"dialer-proxy,omitempty"`
HealthCheck healthCheckSchema `provider:"health-check,omitempty"`
Override ap.OverrideSchema `provider:"override,omitempty"`
Header map[string][]string `provider:"header,omitempty"`
}
type ruleProviderSchema struct {
Type string `provider:"type"`
Behavior string `provider:"behavior"`
Path string `provider:"path,omitempty"`
URL string `provider:"url,omitempty"`
Proxy string `provider:"proxy,omitempty"`
Format string `provider:"format,omitempty"`
Interval int `provider:"interval,omitempty"`
}
type GenerateConfigParams struct { type GenerateConfigParams struct {
ProfilePath *string `json:"profile-path"` ProfilePath *string `json:"profile-path"`
Config *config.RawConfig `json:"config" ` Config *config.RawConfig `json:"config" `
IsPatch *bool `json:"is-patch"` IsPatch *bool `json:"is-patch"`
IsCompatible *bool `json:"is-compatible"`
} }
type ChangeProxyParams struct { type ChangeProxyParams struct {
@@ -46,6 +88,11 @@ type Process struct {
Target string `json:"target"` Target string `json:"target"`
} }
type Now struct {
Name string `json:"name"`
Value string `json:"value"`
}
func restartExecutable(execPath string) { func restartExecutable(execPath string) {
var err error var err error
executor.Shutdown() executor.Shutdown()
@@ -82,6 +129,19 @@ func readFile(path string) ([]byte, error) {
return data, err return data, err
} }
func removeFile(path string) error {
absPath, err := filepath.Abs(path)
if err != nil {
return err
}
err = os.Remove(absPath)
if err != nil {
return err
}
return nil
}
func getRawConfigWithPath(path *string) *config.RawConfig { func getRawConfigWithPath(path *string) *config.RawConfig {
if path == nil { if path == nil {
return config.DefaultRawConfig() return config.DefaultRawConfig()
@@ -100,18 +160,164 @@ func getRawConfigWithPath(path *string) *config.RawConfig {
} }
} }
func decorationConfig(profilePath *string, cfg config.RawConfig) *config.RawConfig { func decorationConfig(profilePath *string, cfg config.RawConfig, compatible bool) *config.RawConfig {
prof := getRawConfigWithPath(profilePath) prof := getRawConfigWithPath(profilePath)
overwriteConfig(prof, cfg) overwriteConfig(prof, cfg, compatible)
return prof return prof
} }
func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig) { func Reduce[T any, U any](s []T, initVal U, f func(U, T) U) U {
for _, v := range s {
initVal = f(initVal, v)
}
return initVal
}
func Map[T, U any](slice []T, fn func(T) U) []U {
result := make([]U, len(slice))
for i, v := range slice {
result[i] = fn(v)
}
return result
}
func replaceFromMap(s string, m map[string]string) string {
for k, v := range m {
s = strings.ReplaceAll(s, k, v)
}
return s
}
func removeDuplicateFromSlice[T any](slice []T) []T {
result := make([]T, 0)
seen := make(map[any]struct{})
for _, value := range slice {
if _, ok := seen[value]; !ok {
result = append(result, value)
seen[value] = struct{}{}
}
}
return result
}
func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
var replacements = map[string]string{}
var selectArr []map[string]any
var urlTestArr []map[string]any
var fallbackArr []map[string]any
for _, group := range *proxyGroup {
switch group["type"] {
case "select":
selectArr = append(selectArr, group)
replacements[group["name"].(string)] = "Proxy"
break
case "url-test":
urlTestArr = append(urlTestArr, group)
replacements[group["name"].(string)] = "Auto"
break
case "fallback":
fallbackArr = append(fallbackArr, group)
replacements[group["name"].(string)] = "Fallback"
break
default:
break
}
}
ProxyProxies := Reduce(selectArr, []string{}, func(res []string, cur map[string]any) []string {
if cur["proxies"] == nil {
return res
}
for _, proxyName := range cur["proxies"].([]interface{}) {
if str, ok := proxyName.(string); ok {
str = replaceFromMap(str, replacements)
if str != "Proxy" {
res = append(res, str)
}
}
}
return res
})
ProxyProxies = removeDuplicateFromSlice(ProxyProxies)
AutoProxies := Reduce(urlTestArr, []string{}, func(res []string, cur map[string]any) []string {
if cur["proxies"] == nil {
return res
}
for _, proxyName := range cur["proxies"].([]interface{}) {
if str, ok := proxyName.(string); ok {
str = replaceFromMap(str, replacements)
if str != "Auto" {
res = append(res, str)
}
}
}
return res
})
AutoProxies = removeDuplicateFromSlice(AutoProxies)
FallbackProxies := Reduce(fallbackArr, []string{}, func(res []string, cur map[string]any) []string {
if cur["proxies"] == nil {
return res
}
for _, proxyName := range cur["proxies"].([]interface{}) {
if str, ok := proxyName.(string); ok {
str = replaceFromMap(str, replacements)
if str != "Fallback" {
res = append(res, str)
}
}
}
return res
})
FallbackProxies = removeDuplicateFromSlice(FallbackProxies)
var computedProxyGroup []map[string]any
if len(ProxyProxies) > 0 {
computedProxyGroup = append(computedProxyGroup,
map[string]any{
"name": "Proxy",
"type": "select",
"proxies": ProxyProxies,
})
}
if len(AutoProxies) > 0 {
computedProxyGroup = append(computedProxyGroup,
map[string]any{
"name": "Auto",
"type": "url-test",
"proxies": AutoProxies,
})
}
if len(FallbackProxies) > 0 {
computedProxyGroup = append(computedProxyGroup,
map[string]any{
"name": "Fallback",
"type": "fallback",
"proxies": FallbackProxies,
})
}
computedRule := Map(*rule, func(value string) string {
return replaceFromMap(value, replacements)
})
*proxyGroup = computedProxyGroup
*rule = computedRule
}
func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig, compatible bool) {
targetConfig.ExternalController = "" targetConfig.ExternalController = ""
targetConfig.ExternalUI = "" targetConfig.ExternalUI = ""
targetConfig.Interface = "" targetConfig.Interface = ""
targetConfig.ExternalUIURL = "" targetConfig.ExternalUIURL = ""
targetConfig.IPv6 = patchConfig.IPv6 //targetConfig.IPv6 = patchConfig.IPv6
targetConfig.LogLevel = patchConfig.LogLevel targetConfig.LogLevel = patchConfig.LogLevel
targetConfig.FindProcessMode = process.FindProcessAlways targetConfig.FindProcessMode = process.FindProcessAlways
targetConfig.AllowLan = patchConfig.AllowLan targetConfig.AllowLan = patchConfig.AllowLan
@@ -121,22 +327,22 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
targetConfig.Tun.Device = patchConfig.Tun.Device targetConfig.Tun.Device = patchConfig.Tun.Device
targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
targetConfig.Tun.Stack = patchConfig.Tun.Stack targetConfig.Tun.Stack = patchConfig.Tun.Stack
targetConfig.GeodataLoader = "standard"
targetConfig.Profile.StoreSelected = false
if targetConfig.DNS.Enable == false { if targetConfig.DNS.Enable == false {
targetConfig.DNS = patchConfig.DNS targetConfig.DNS = patchConfig.DNS
} else {
targetConfig.DNS.UseHosts = patchConfig.DNS.UseHosts
targetConfig.DNS.EnhancedMode = patchConfig.DNS.EnhancedMode
targetConfig.DNS.IPv6 = patchConfig.DNS.IPv6
targetConfig.DNS.DefaultNameserver = append(patchConfig.DNS.DefaultNameserver, targetConfig.DNS.DefaultNameserver...)
targetConfig.DNS.NameServer = append(patchConfig.DNS.NameServer, targetConfig.DNS.NameServer...)
targetConfig.DNS.FakeIPFilter = append(patchConfig.DNS.FakeIPFilter, targetConfig.DNS.FakeIPFilter...)
targetConfig.DNS.Fallback = append(patchConfig.DNS.Fallback, targetConfig.DNS.Fallback...)
if runtime.GOOS == "android" {
targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
} else if runtime.GOOS == "windows" {
targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
}
} }
if runtime.GOOS == "android" {
targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
} else if runtime.GOOS == "windows" {
targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
}
if compatible == false {
targetConfig.ProxyProvider = make(map[string]map[string]any)
targetConfig.RuleProvider = make(map[string]map[string]any)
generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
}
} }
func patchConfig(general *config.General) { func patchConfig(general *config.General) {
@@ -164,10 +370,29 @@ func patchConfig(general *config.General) {
resolver.DisableIPv6 = !general.IPv6 resolver.DisableIPv6 = !general.IPv6
} }
func applyConfig(isPatch bool) bool { const concurrentCount = math.MaxInt
if currentConfig == nil {
return false func hcCompatibleProvider(proxyProviders map[string]provider.ProxyProvider) {
wg := sync.WaitGroup{}
ch := make(chan struct{}, concurrentCount)
for _, proxyProvider := range proxyProviders {
proxyProvider := proxyProvider
if proxyProvider.VehicleType() == provider.Compatible {
log.Infoln("Start initial Compatible provider %s", proxyProvider.Name())
wg.Add(1)
ch <- struct{}{}
go func() {
defer func() { <-ch; wg.Done() }()
if err := proxyProvider.Initial(); err != nil {
log.Errorln("initial Compatible provider %s error: %v", proxyProvider.Name(), err)
}
}()
}
} }
}
func applyConfig(isPatch bool) {
cfg, err := config.ParseRawConfig(currentConfig) cfg, err := config.ParseRawConfig(currentConfig)
if err != nil { if err != nil {
cfg, _ = config.ParseRawConfig(config.DefaultRawConfig()) cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
@@ -176,7 +401,6 @@ func applyConfig(isPatch bool) bool {
patchConfig(cfg.General) patchConfig(cfg.General)
} else { } else {
executor.ApplyConfig(cfg, true) executor.ApplyConfig(cfg, true)
healthcheck()
} }
return true
} }

View File

@@ -24,7 +24,7 @@ func InitDartApi(api unsafe.Pointer) {
} }
} }
func sendToPort(port int64, msg string) { func SendToPort(port int64, msg string) {
var obj C.Dart_CObject var obj C.Dart_CObject
obj._type = C.Dart_CObject_kString obj._type = C.Dart_CObject_kString
msgString := C.CString(msg) msgString := C.CString(msg)

View File

@@ -10,6 +10,7 @@ const (
Log MessageType = "log" Log MessageType = "log"
Tun MessageType = "tun" Tun MessageType = "tun"
Delay MessageType = "delay" Delay MessageType = "delay"
Now MessageType = "now"
Process MessageType = "process" Process MessageType = "process"
) )
@@ -18,11 +19,11 @@ type Message struct {
Data interface{} `json:"data"` Data interface{} `json:"data"`
} }
func (message *Message) toJson() string { func (message *Message) Json() string {
data, _ := json.Marshal(message) data, _ := json.Marshal(message)
return string(data) return string(data)
} }
func SendMessage(message Message) { func SendMessage(message Message) {
sendToPort(*Port, message.toJson()) SendToPort(*Port, message.Json())
} }

View File

@@ -7,6 +7,8 @@ import (
"fmt" "fmt"
"github.com/metacubex/mihomo/adapter" "github.com/metacubex/mihomo/adapter"
"github.com/metacubex/mihomo/adapter/outboundgroup" "github.com/metacubex/mihomo/adapter/outboundgroup"
"github.com/metacubex/mihomo/adapter/provider"
"github.com/metacubex/mihomo/common/structure"
"github.com/metacubex/mihomo/common/utils" "github.com/metacubex/mihomo/common/utils"
"github.com/metacubex/mihomo/config" "github.com/metacubex/mihomo/config"
"github.com/metacubex/mihomo/constant" "github.com/metacubex/mihomo/constant"
@@ -21,7 +23,7 @@ import (
"unsafe" "unsafe"
) )
var currentConfig *config.RawConfig var currentConfig = config.DefaultRawConfig()
var isInit = false var isInit = false
@@ -63,26 +65,63 @@ func validateConfig(s *C.char) bool {
} }
//export updateConfig //export updateConfig
func updateConfig(s *C.char) bool { func updateConfig(s *C.char, port C.longlong) {
paramsString := C.GoString(s) i := int64(port)
var params = &GenerateConfigParams{} go func() {
err := json.Unmarshal([]byte(paramsString), params) paramsString := C.GoString(s)
if err != nil { var params = &GenerateConfigParams{}
log.Errorln("generateConfig Unmarshal error %v", err) err := json.Unmarshal([]byte(paramsString), params)
return false if err != nil {
} bridge.SendToPort(i, err.Error())
prof := decorationConfig(params.ProfilePath, *params.Config) return
currentConfig = prof }
if *params.IsPatch { prof := decorationConfig(params.ProfilePath, *params.Config, *params.IsCompatible)
return applyConfig(true) currentConfig = prof
} else { if *params.IsPatch {
return applyConfig(false) applyConfig(true)
} } else {
applyConfig(false)
}
bridge.SendToPort(i, "")
}()
}
//export clearEffect
func clearEffect(s *C.char) {
path := C.GoString(s)
go func() {
rawCfg := getRawConfigWithPath(&path)
for _, mapping := range rawCfg.RuleProvider {
schema := &ruleProviderSchema{}
decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
if err := decoder.Decode(mapping, schema); err != nil {
return
}
if schema.Type == "http" {
_ = removeFile(constant.Path.Resolve(schema.Path))
}
}
for _, mapping := range rawCfg.ProxyProvider {
schema := &proxyProviderSchema{
HealthCheck: healthCheckSchema{
Lazy: true,
},
}
decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
if err := decoder.Decode(mapping, schema); err != nil {
return
}
if schema.Type == "http" {
_ = removeFile(constant.Path.Resolve(schema.Path))
}
}
_ = removeFile(path)
}()
} }
//export getProxies //export getProxies
func getProxies() *C.char { func getProxies() *C.char {
data, err := json.Marshal(tunnel.Proxies()) data, err := json.Marshal(tunnel.ProxiesWithProviders())
if err != nil { if err != nil {
return C.CString("") return C.CString("")
} }
@@ -91,27 +130,28 @@ func getProxies() *C.char {
//export changeProxy //export changeProxy
func changeProxy(s *C.char) bool { func changeProxy(s *C.char) bool {
paramsString := C.GoString(s) go func() {
var params = &ChangeProxyParams{} paramsString := C.GoString(s)
err := json.Unmarshal([]byte(paramsString), params) var params = &ChangeProxyParams{}
if err != nil { err := json.Unmarshal([]byte(paramsString), params)
log.Infoln("Unmarshal ChangeProxyParams %v", err) if err != nil {
return false log.Infoln("Unmarshal ChangeProxyParams %v", err)
} }
proxies := tunnel.Proxies() proxies := tunnel.ProxiesWithProviders()
proxy := proxies[*params.GroupName] proxy := proxies[*params.GroupName]
if proxy == nil { if proxy == nil {
return false return
} }
log.Infoln("change proxy %s", proxy.Name()) log.Infoln("change proxy %s", proxy.Name())
adapterProxy := proxy.(*adapter.Proxy) adapterProxy := proxy.(*adapter.Proxy)
selector, ok := adapterProxy.ProxyAdapter.(*outboundgroup.Selector) selector, ok := adapterProxy.ProxyAdapter.(*outboundgroup.Selector)
if !ok { if !ok {
return false return
} }
if err := selector.Set(*params.ProxyName); err != nil { if err := selector.Set(*params.ProxyName); err != nil {
return false return
} }
}()
return true return true
} }
@@ -148,7 +188,7 @@ func asyncTestDelay(s *C.char) {
ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(params.Timeout)) ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(params.Timeout))
defer cancel() defer cancel()
proxies := tunnel.Proxies() proxies := tunnel.ProxiesWithProviders()
proxy := proxies[params.ProxyName] proxy := proxies[params.ProxyName]
delayData := &Delay{ delayData := &Delay{
@@ -239,17 +279,38 @@ func getProviders() *C.char {
func getProvider(name *C.char) *C.char { func getProvider(name *C.char) *C.char {
providerName := C.GoString(name) providerName := C.GoString(name)
providers := tunnel.Providers() providers := tunnel.Providers()
var provider = providers[providerName] data, err := json.Marshal(providers[providerName])
data, err := json.Marshal(provider)
if err != nil { if err != nil {
return C.CString("") return C.CString("")
} }
return C.CString(string(data)) return C.CString(string(data))
} }
//export healthcheck
func healthcheck() {
hcCompatibleProvider(tunnel.Providers())
}
//export initNativeApiBridge //export initNativeApiBridge
func initNativeApiBridge(api unsafe.Pointer, port C.longlong) { func initNativeApiBridge(api unsafe.Pointer, port C.longlong) {
bridge.InitDartApi(api) bridge.InitDartApi(api)
i := int64(port) i := int64(port)
bridge.Port = &i bridge.Port = &i
} }
func init() {
provider.HealthcheckHook = func(name string, delay uint16) {
delayData := &Delay{
Name: name,
}
if delay == 0 {
delayData.Value = -1
} else {
delayData.Value = int32(delay)
}
bridge.SendMessage(bridge.Message{
Type: bridge.Delay,
Data: delayData,
})
}
}

View File

@@ -1,3 +1,5 @@
import 'dart:async';
import 'package:dynamic_color/dynamic_color.dart'; import 'package:dynamic_color/dynamic_color.dart';
import 'package:fl_clash/l10n/l10n.dart'; import 'package:fl_clash/l10n/l10n.dart';
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
@@ -25,8 +27,14 @@ runAppWithPreferences(
ChangeNotifierProvider<Config>( ChangeNotifierProvider<Config>(
create: (_) => config, create: (_) => config,
), ),
ChangeNotifierProvider<AppState>( ChangeNotifierProxyProvider2<Config, ClashConfig, AppState>(
create: (_) => appState, create: (_) => appState,
update: (_, config, clashConfig, appState) {
appState?.mode = clashConfig.mode;
appState?.isCompatible = config.isCompatible;
appState?.selectedMap = config.currentSelectedMap;
return appState!;
},
) )
], ],
child: child, child: child,
@@ -43,9 +51,17 @@ class Application extends StatefulWidget {
} }
class ApplicationState extends State<Application> { class ApplicationState extends State<Application> {
late AppController appController;
late SystemColorSchemes systemColorSchemes; late SystemColorSchemes systemColorSchemes;
final _pageTransitionsTheme = const PageTransitionsTheme(
builders: <TargetPlatform, PageTransitionsBuilder>{
TargetPlatform.android: CupertinoPageTransitionsBuilder(),
TargetPlatform.windows: CupertinoPageTransitionsBuilder(),
TargetPlatform.linux: CupertinoPageTransitionsBuilder(),
TargetPlatform.macOS: CupertinoPageTransitionsBuilder(),
},
);
ColorScheme _getAppColorScheme({ ColorScheme _getAppColorScheme({
required Brightness brightness, required Brightness brightness,
int? primaryColor, int? primaryColor,
@@ -64,10 +80,12 @@ class ApplicationState extends State<Application> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
appController = AppController(context); globalState.appController = AppController(context);
WidgetsBinding.instance.addPostFrameCallback((timeStamp) async { WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
appController.afterInit(); globalState.appController.updateViewWidth();
appController.initLink(); globalState.appController.afterInit();
globalState.appController.initLink();
_updateGroups();
}); });
} }
@@ -96,10 +114,24 @@ class ApplicationState extends State<Application> {
); );
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
appController.updateSystemColorSchemes(systemColorSchemes); globalState.appController.updateSystemColorSchemes(systemColorSchemes);
}); });
} }
_updateGroups() {
if (globalState.groupsUpdateTimer != null) {
globalState.groupsUpdateTimer?.cancel();
globalState.groupsUpdateTimer = null;
}
globalState.groupsUpdateTimer ??= Timer.periodic(
httpTimeoutDuration,
(timer) async {
await globalState.appController.updateGroups();
globalState.appController.appState.sortNum++;
},
);
}
@override @override
Widget build(context) { Widget build(context) {
return AppStateContainer( return AppStateContainer(
@@ -112,7 +144,6 @@ class ApplicationState extends State<Application> {
primaryColor: config.primaryColor, primaryColor: config.primaryColor,
), ),
builder: (_, state, child) { builder: (_, state, child) {
debugPrint("[Application] update===>");
return DynamicColorBuilder( return DynamicColorBuilder(
builder: (lightDynamic, darkDynamic) { builder: (lightDynamic, darkDynamic) {
_updateSystemColorSchemes(lightDynamic, darkDynamic); _updateSystemColorSchemes(lightDynamic, darkDynamic);
@@ -124,12 +155,13 @@ class ApplicationState extends State<Application> {
GlobalCupertinoLocalizations.delegate, GlobalCupertinoLocalizations.delegate,
GlobalWidgetsLocalizations.delegate GlobalWidgetsLocalizations.delegate
], ],
title: appConstant.name, title: appName,
locale: Other.getLocaleForString(state.locale), locale: other.getLocaleForString(state.locale),
supportedLocales: supportedLocales:
AppLocalizations.delegate.supportedLocales, AppLocalizations.delegate.supportedLocales,
themeMode: state.themeMode, themeMode: state.themeMode,
theme: ThemeData( theme: ThemeData(
pageTransitionsTheme: _pageTransitionsTheme,
useMaterial3: true, useMaterial3: true,
colorScheme: _getAppColorScheme( colorScheme: _getAppColorScheme(
brightness: Brightness.light, brightness: Brightness.light,
@@ -139,6 +171,7 @@ class ApplicationState extends State<Application> {
), ),
darkTheme: ThemeData( darkTheme: ThemeData(
useMaterial3: true, useMaterial3: true,
pageTransitionsTheme: _pageTransitionsTheme,
colorScheme: _getAppColorScheme( colorScheme: _getAppColorScheme(
brightness: Brightness.dark, brightness: Brightness.dark,
systemColorSchemes: systemColorSchemes, systemColorSchemes: systemColorSchemes,
@@ -160,7 +193,7 @@ class ApplicationState extends State<Application> {
@override @override
Future<void> dispose() async { Future<void> dispose() async {
linkManager.destroy(); linkManager.destroy();
await appController.savePreferences(); await globalState.appController.savePreferences();
super.dispose(); super.dispose();
} }
} }

View File

@@ -1,3 +1,4 @@
import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'dart:ffi'; import 'dart:ffi';
import 'dart:io'; import 'dart:io';
@@ -16,19 +17,22 @@ class ClashCore {
late final ClashFFI clashFFI; late final ClashFFI clashFFI;
late final DynamicLibrary lib; late final DynamicLibrary lib;
ClashCore._internal() { DynamicLibrary _getClashLib() {
if (Platform.isWindows) { if (Platform.isWindows) {
lib = DynamicLibrary.open("libclash.dll"); return DynamicLibrary.open("libclash.dll");
clashFFI = ClashFFI(lib);
} }
if (Platform.isMacOS) { if (Platform.isMacOS) {
lib = DynamicLibrary.open("libclash.dylib"); return DynamicLibrary.open("libclash.dylib");
clashFFI = ClashFFI(lib);
} }
if (Platform.isAndroid || Platform.isLinux) { if (Platform.isAndroid || Platform.isLinux) {
lib = DynamicLibrary.open("libclash.so"); return DynamicLibrary.open("libclash.so");
clashFFI = ClashFFI(lib);
} }
throw "Platform is not supported";
}
ClashCore._internal() {
lib = _getClashLib();
clashFFI = ClashFFI(lib);
clashFFI.initNativeApiBridge( clashFFI.initNativeApiBridge(
NativeApi.initializeApiDLData, NativeApi.initializeApiDLData,
receiver.sendPort.nativePort, receiver.sendPort.nativePort,
@@ -61,51 +65,71 @@ class ClashCore {
1; 1;
} }
bool updateConfig(UpdateConfigParams updateConfigParams) { Future<String> updateConfig(UpdateConfigParams updateConfigParams) {
final completer = Completer<String>();
final receiver = ReceivePort();
receiver.listen((message) {
if (!completer.isCompleted) {
completer.complete(message);
receiver.close();
}
});
final params = json.encode(updateConfigParams); final params = json.encode(updateConfigParams);
return clashFFI.updateConfig( clashFFI.updateConfig(
params.toNativeUtf8().cast(), params.toNativeUtf8().cast(),
) == receiver.sendPort.nativePort,
1; );
return completer.future;
} }
List<Group> getProxiesGroups() { Future<List<Group>> getProxiesGroups() {
final proxiesRaw = clashFFI.getProxies(); final proxiesRaw = clashFFI.getProxies();
final proxies = json.decode(proxiesRaw.cast<Utf8>().toDartString()); final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
final groupsRaw = List.from(proxies.values).where((e) { return Isolate.run<List<Group>>(() {
final excludeName = !UsedProxyExtension.valueList final proxies = json.decode(proxiesRawString);
.where((element) => element != UsedProxy.GLOBAL.name) final groupNames = [
.contains(e['name']); UsedProxy.GLOBAL.name,
final validType = GroupTypeExtension.valueList.contains(e['type']); ...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
return excludeName && validType; final proxy = proxies[e];
}).map( return GroupTypeExtension.valueList.contains(proxy['type']);
(e) { })
e["all"] = ((e["all"] ?? []) as List) ];
final groupsRaw = groupNames.map((groupName) {
final group = proxies[groupName];
group["all"] = ((group["all"] ?? []) as List)
.map( .map(
(name) => proxies[name], (name) => proxies[name],
) )
.toList(); .toList();
return e; return group;
}, }).toList();
).toList() return groupsRaw.map((e) => Group.fromJson(e)).toList();
..sort( });
(a, b) { }
final aIndex = GroupTypeExtension.getGroupType(a['type'])?.index;
final bIndex = GroupTypeExtension.getGroupType(b['type'])?.index; Future<DelayMap> getDelayMap() {
if (a == null && b == null) { final proxiesRaw = clashFFI.getProxies();
return 0; final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
return Isolate.run<DelayMap>(() {
final proxies = json.decode(proxiesRawString) as Map<String, dynamic>;
return proxies.map<String, int?>(
(k, v) {
final history = v["history"] as List<dynamic>;
if (history.isEmpty) {
return MapEntry(
k,
null,
);
} else {
final delay = history.last["delay"];
return MapEntry(
k,
delay != 0 ? delay : -1,
);
} }
if (a == null) {
return 1;
}
if (b == null) {
return -1;
}
return aIndex! - bIndex!;
}, },
); );
final groups = groupsRaw.map((e) => Group.fromJson(e)).toList(); });
return groups;
} }
bool changeProxy(ChangeProxyParams changeProxyParams) { bool changeProxy(ChangeProxyParams changeProxyParams) {
@@ -116,12 +140,20 @@ class ClashCore {
bool delay(String proxyName) { bool delay(String proxyName) {
final delayParams = { final delayParams = {
"proxy-name": proxyName, "proxy-name": proxyName,
"timeout": appConstant.httpTimeoutDuration.inMilliseconds, "timeout": httpTimeoutDuration.inMilliseconds,
}; };
clashFFI.asyncTestDelay(json.encode(delayParams).toNativeUtf8().cast()); clashFFI.asyncTestDelay(json.encode(delayParams).toNativeUtf8().cast());
return true; return true;
} }
clearEffect(String path) {
clashFFI.clearEffect(path.toNativeUtf8().cast());
}
healthcheck() {
clashFFI.healthcheck();
}
VersionInfo getVersionInfo() { VersionInfo getVersionInfo() {
final versionInfoRaw = clashFFI.getVersionInfo(); final versionInfoRaw = clashFFI.getVersionInfo();
final versionInfo = json.decode(versionInfoRaw.cast<Utf8>().toDartString()); final versionInfo = json.decode(versionInfoRaw.cast<Utf8>().toDartString());

View File

@@ -907,19 +907,36 @@ class ClashFFI {
late final _validateConfig = late final _validateConfig =
_validateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>(); _validateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>();
int updateConfig( void updateConfig(
ffi.Pointer<ffi.Char> s, ffi.Pointer<ffi.Char> s,
int port,
) { ) {
return _updateConfig( return _updateConfig(
s, s,
port,
);
}
late final _updateConfigPtr = _lookup<
ffi.NativeFunction<
ffi.Void Function(
ffi.Pointer<ffi.Char>, ffi.LongLong)>>('updateConfig');
late final _updateConfig =
_updateConfigPtr.asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
void clearEffect(
ffi.Pointer<ffi.Char> s,
) {
return _clearEffect(
s,
); );
} }
late final _updateConfigPtr = late final _clearEffectPtr =
_lookup<ffi.NativeFunction<GoUint8 Function(ffi.Pointer<ffi.Char>)>>( _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
'updateConfig'); 'clearEffect');
late final _updateConfig = late final _clearEffect =
_updateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>(); _clearEffectPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
ffi.Pointer<ffi.Char> getProxies() { ffi.Pointer<ffi.Char> getProxies() {
return _getProxies(); return _getProxies();
@@ -1037,6 +1054,14 @@ class ClashFFI {
late final _getProvider = _getProviderPtr late final _getProvider = _getProviderPtr
.asFunction<ffi.Pointer<ffi.Char> Function(ffi.Pointer<ffi.Char>)>(); .asFunction<ffi.Pointer<ffi.Char> Function(ffi.Pointer<ffi.Char>)>();
void healthcheck() {
return _healthcheck();
}
late final _healthcheckPtr =
_lookup<ffi.NativeFunction<ffi.Void Function()>>('healthcheck');
late final _healthcheck = _healthcheckPtr.asFunction<void Function()>();
void initNativeApiBridge( void initNativeApiBridge(
ffi.Pointer<ffi.Void> api, ffi.Pointer<ffi.Void> api,
int port, int port,

View File

@@ -15,6 +15,8 @@ abstract mixin class ClashMessageListener {
void onDelay(Delay delay) {} void onDelay(Delay delay) {}
void onProcess(Metadata metadata) {} void onProcess(Metadata metadata) {}
void onNow(Now now) {}
} }
class ClashMessage { class ClashMessage {
@@ -41,6 +43,9 @@ class ClashMessage {
case MessageType.process: case MessageType.process:
listener.onProcess(Metadata.fromJson(m.data)); listener.onProcess(Metadata.fromJson(m.data));
break; break;
case MessageType.now:
listener.onNow(Now.fromJson(m.data));
break;
} }
} }
}); });

View File

@@ -2,6 +2,7 @@ import 'dart:io';
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'core.dart'; import 'core.dart';
class ClashService { class ClashService {

View File

@@ -8,7 +8,7 @@ export 'num.dart';
export 'navigation.dart'; export 'navigation.dart';
export 'window.dart'; export 'window.dart';
export 'system.dart'; export 'system.dart';
export 'file.dart'; export 'picker.dart';
export 'android.dart'; export 'android.dart';
export 'launch.dart'; export 'launch.dart';
export 'protocol.dart'; export 'protocol.dart';

View File

@@ -2,27 +2,26 @@ import 'dart:ui';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class AppConstant { const appName = "FlClash";
final packageName = "com.follow.clash"; const coreName = "clash.meta";
final name = "FlClash"; const packageName = "FlClash";
final httpTimeoutDuration = const Duration(milliseconds: 5000); const httpTimeoutDuration = Duration(milliseconds: 5000);
final moreDuration = const Duration(milliseconds: 100); const moreDuration = Duration(milliseconds: 100);
final defaultUpdateDuration = const Duration(days: 1); const defaultUpdateDuration = Duration(days: 1);
final mmdbFileName = "geoip.metadb"; const mmdbFileName = "geoip.metadb";
final profilesDirectoryName = "profiles"; const profilesDirectoryName = "profiles";
final configFileName = "config.yaml"; const localhost = "127.0.0.1";
final localhost = "127.0.0.1"; const clashConfigKey = "clash_config";
final clashKey = "clash"; const configKey = "config";
final configKey = "config"; const listItemPadding = EdgeInsets.symmetric(horizontal: 16);
final listItemPadding = const EdgeInsets.symmetric(horizontal: 16); const double dialogCommonWidth = 300;
final dialogCommonWidth = 300; const repository = "chen08209/FlClash";
final repository = "chen08209/FlClash"; const maxMobileWidth = 600;
final filter = ImageFilter.blur( const maxLaptopWidth = 840;
sigmaX: 5, final filter = ImageFilter.blur(
sigmaY: 5, sigmaX: 5,
tileMode: TileMode.mirror, sigmaY: 5,
); tileMode: TileMode.mirror,
final defaultPrimaryColor = Colors.brown; );
}
final appConstant = AppConstant(); const defaultPrimaryColor = Colors.brown;

View File

@@ -1,15 +1,7 @@
import 'package:fl_clash/application.dart';
import 'package:fl_clash/controller.dart';
import 'package:fl_clash/widgets/scaffold.dart'; import 'package:fl_clash/widgets/scaffold.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
extension BuildContextExtension on BuildContext { extension BuildContextExtension on BuildContext {
AppController get appController {
final appController =
findAncestorStateOfType<ApplicationState>()?.appController;
assert(appController != null, "only use application environment");
return appController!;
}
CommonScaffoldState? get commonScaffoldState { CommonScaffoldState? get commonScaffoldState {
return findAncestorStateOfType<CommonScaffoldState>(); return findAncestorStateOfType<CommonScaffoldState>();
@@ -19,8 +11,6 @@ extension BuildContextExtension on BuildContext {
return MediaQuery.of(this).size.width; return MediaQuery.of(this).size.width;
} }
bool get isMobile => width < 600;
ColorScheme get colorScheme => Theme.of(this).colorScheme; ColorScheme get colorScheme => Theme.of(this).colorScheme;
TextTheme get textTheme => Theme.of(this).textTheme; TextTheme get textTheme => Theme.of(this).textTheme;

107
lib/common/dav_client.dart Normal file
View File

@@ -0,0 +1,107 @@
import 'dart:async';
import 'dart:convert';
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:path/path.dart';
import 'package:webdav_client/webdav_client.dart';
class DAVClient {
late Client client;
Completer<bool> pingCompleter = Completer();
DAVClient(DAV dav) {
client = newClient(
dav.uri,
user: dav.user,
password: dav.password,
);
client.setHeaders(
{
'accept-charset': 'utf-8',
'Content-Type': 'text/xml',
},
);
client.setConnectTimeout(8000);
client.setSendTimeout(8000);
client.setReceiveTimeout(8000);
pingCompleter.complete(_ping());
}
Future<bool> _ping() async {
try {
await client.ping();
await client.mkdir("/$appName");
await client.mkdir("/$appName/$profilesDirectoryName");
return true;
} catch (_) {
return false;
}
}
get root => "/$appName";
get remoteConfig => "$root/$configKey.json";
get remoteClashConfig => "$root/$clashConfigKey.json";
get remoteProfiles => "$root/$profilesDirectoryName";
backup() async {
final appController = globalState.appController;
final config = appController.config;
final clashConfig = appController.clashConfig;
await client.mkdir("$root");
client.write(
remoteConfig,
utf8.encode(
json.encode(config.toJson()),
),
);
client.write(
remoteClashConfig,
utf8.encode(
json.encode(clashConfig.toJson()),
),
);
await client.remove(remoteProfiles);
for (final profile in config.profiles) {
final path = await appPath.getProfilePath(profile.id);
if (path == null) continue;
await client.writeFromFile(
path,
"$remoteProfiles/${basename(path)}",
);
}
return true;
}
recovery({required RecoveryOption recoveryOption}) async {
final profiles = await client.readDir(remoteProfiles);
final profilesPath = await appPath.getProfilesPath();
for (final file in profiles) {
await client.read2File(
"$remoteProfiles/${file.name}",
join(
profilesPath,
file.name,
),
);
}
final configRaw = utf8.decode((await client.read(remoteConfig)));
final clashConfigRaw = utf8.decode(await client.read(remoteClashConfig));
final config = Config.fromJson(json.decode(configRaw));
final clashConfig = ClashConfig.fromJson(json.decode(clashConfigRaw));
if(recoveryOption == RecoveryOption.onlyProfiles){
globalState.appController.config.update(config, RecoveryOption.onlyProfiles);
}else{
globalState.appController.config.update(config, RecoveryOption.all);
globalState.appController.clashConfig.update(clashConfig);
}
await globalState.appController.applyProfile();
globalState.appController.savePreferences();
return true;
}
}

View File

@@ -1,29 +0,0 @@
import 'dart:io';
import 'package:file_picker/file_picker.dart';
import 'package:fl_clash/common/app_localizations.dart';
import 'package:fl_clash/models/models.dart';
class FileUtil {
static Future<Result<PlatformFile>> pickerConfig() async {
FilePickerResult? filePickerResult;
if (Platform.isAndroid) {
filePickerResult = await FilePicker.platform.pickFiles(
withData: true,
type: FileType.custom,
allowedExtensions: ['txt', 'conf'],
);
} else {
filePickerResult = await FilePicker.platform.pickFiles(
withData: true,
type: FileType.custom,
allowedExtensions: ['yaml', 'txt', 'conf'],
);
}
final file = filePickerResult?.files.first;
if (file == null) {
return Result.error(message: appLocalizations.pleaseUploadFile);
}
return Result.success(data: file);
}
}

View File

@@ -19,8 +19,8 @@ Function debounce<F extends Function>(F func,{int milliseconds = 600}) {
if (timer != null) { if (timer != null) {
timer!.cancel(); timer!.cancel();
} }
timer = Timer(Duration(milliseconds: milliseconds), () { timer = Timer(Duration(milliseconds: milliseconds), () async {
Function.apply(func, args ?? [], namedArgs); await Function.apply(func, args ?? [], namedArgs);
}); });
}; };
} }

View File

@@ -10,7 +10,7 @@ class AutoLaunch {
AutoLaunch._internal() { AutoLaunch._internal() {
launchAtStartup.setup( launchAtStartup.setup(
appName: appConstant.name, appName: appName,
appPath: Platform.resolvedExecutable, appPath: Platform.resolvedExecutable,
); );
} }

View File

@@ -1,23 +1,27 @@
import 'dart:io'; import 'dart:io';
import 'dart:isolate';
import 'dart:typed_data';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:zxing2/qrcode.dart';
import 'package:image/image.dart' as img;
class Other { class Other {
static Color? getDelayColor(int? delay) { Color? getDelayColor(int? delay) {
if (delay == null) return null; if (delay == null) return null;
if (delay < 0) return Colors.red; if (delay < 0) return Colors.red;
if (delay < 600) return Colors.green; if (delay < 600) return Colors.green;
return const Color(0xFFC57F0A); return const Color(0xFFC57F0A);
} }
static String getDateStringLast2(int value) { String getDateStringLast2(int value) {
var valueRaw = "0$value"; var valueRaw = "0$value";
return valueRaw.substring( return valueRaw.substring(
valueRaw.length - 2, valueRaw.length - 2,
); );
} }
static String getTimeDifference(DateTime dateTime) { String getTimeDifference(DateTime dateTime) {
var currentDateTime = DateTime.now(); var currentDateTime = DateTime.now();
var difference = currentDateTime.difference(dateTime); var difference = currentDateTime.difference(dateTime);
var inHours = difference.inHours; var inHours = difference.inHours;
@@ -27,7 +31,7 @@ class Other {
return "${getDateStringLast2(inHours)}:${getDateStringLast2(inMinutes)}:${getDateStringLast2(inSeconds)}"; return "${getDateStringLast2(inHours)}:${getDateStringLast2(inMinutes)}:${getDateStringLast2(inSeconds)}";
} }
static String getTimeText(int? timeStamp) { String getTimeText(int? timeStamp) {
if (timeStamp == null) { if (timeStamp == null) {
return '00:00:00'; return '00:00:00';
} }
@@ -39,7 +43,7 @@ class Other {
return "${getDateStringLast2(inHours)}:${getDateStringLast2(inMinutes)}:${getDateStringLast2(inSeconds)}"; return "${getDateStringLast2(inHours)}:${getDateStringLast2(inMinutes)}:${getDateStringLast2(inSeconds)}";
} }
static Locale? getLocaleForString(String? localString) { Locale? getLocaleForString(String? localString) {
if (localString == null) return null; if (localString == null) return null;
var localSplit = localString.split("_"); var localSplit = localString.split("_");
if (localSplit.length == 1) { if (localSplit.length == 1) {
@@ -57,7 +61,7 @@ class Other {
return null; return null;
} }
static int sortByChar(String a, String b) { int sortByChar(String a, String b) {
if (a.isEmpty && b.isEmpty) { if (a.isEmpty && b.isEmpty) {
return 0; return 0;
} }
@@ -77,7 +81,7 @@ class Other {
} }
} }
static String getOverwriteLabel(String label) { String getOverwriteLabel(String label) {
final reg = RegExp(r'\((\d+)\)$'); final reg = RegExp(r'\((\d+)\)$');
final matches = reg.allMatches(label); final matches = reg.allMatches(label);
if (matches.isNotEmpty) { if (matches.isNotEmpty) {
@@ -89,21 +93,7 @@ class Other {
} }
} }
// static FutureOr<void> Function(T p) debounce<T>(void Function(T? p) func, String getTrayIconPath() {
// {Duration? duration}) {
// Timer? timer;
// return ([T? p]) {
// if (timer != null) {
// timer?.cancel();
// }
// timer = Timer(duration ?? const Duration(milliseconds: 300), () {
// func(p);
// });
// };
// }
static String getTrayIconPath() {
if (Platform.isWindows) { if (Platform.isWindows) {
return "assets/images/app_icon.ico"; return "assets/images/app_icon.ico";
} else { } else {
@@ -111,7 +101,7 @@ class Other {
} }
} }
static int compareVersions(String version1, String version2) { int compareVersions(String version1, String version2) {
List<String> v1 = version1.split('+')[0].split('.'); List<String> v1 = version1.split('+')[0].split('.');
List<String> v2 = version2.split('+')[0].split('.'); List<String> v2 = version2.split('+')[0].split('.');
int major1 = int.parse(v1[0]); int major1 = int.parse(v1[0]);
@@ -133,4 +123,61 @@ class Other {
int build2 = version2.contains('+') ? int.parse(version2.split('+')[1]) : 0; int build2 = version2.contains('+') ? int.parse(version2.split('+')[1]) : 0;
return build1.compareTo(build2); return build1.compareTo(build2);
} }
Future<String?> parseQRCode(Uint8List? bytes) {
return Isolate.run<String?>(() {
if (bytes == null) return null;
img.Image? image = img.decodeImage(bytes);
LuminanceSource source = RGBLuminanceSource(
image!.width,
image.height,
image
.convert(numChannels: 4)
.getBytes(order: img.ChannelOrder.abgr)
.buffer
.asInt32List(),
);
final bitmap = BinaryBitmap(GlobalHistogramBinarizer(source));
final reader = QRCodeReader();
try {
final result = reader.decode(bitmap);
return result.text;
} catch (_) {
return null;
}
});
}
String? getFileNameForDisposition(String? disposition) {
if (disposition == null) return null;
final parseValue = HeaderValue.parse(disposition);
final parameters = parseValue.parameters;
final key = parameters.keys
.firstWhere((key) => key.startsWith("filename"), orElse: () => '');
if (key.isEmpty) return null;
if (key == "filename*") {
return Uri.decodeComponent((parameters[key] ?? "").split("'").last);
} else {
return parameters[key];
}
}
double getViewWidth() {
final view = WidgetsBinding.instance.platformDispatcher.views.first;
final size = view.physicalSize / view.devicePixelRatio;
return size.width;
}
List<String> parseReleaseBody(String? body) {
if(body == null) return [];
const pattern = r'- (.+?)\. \[.+?\]';
final regex = RegExp(pattern);
return regex
.allMatches(body)
.map((match) => match.group(1) ?? '')
.where((item) => item.isNotEmpty)
.toList();
}
} }
final other = Other();

View File

@@ -26,14 +26,9 @@ class AppPath {
return directory.path; return directory.path;
} }
Future<String> getConfigPath() async {
final directory = await applicationSupportDirectoryCompleter.future;
return join(directory.path, appConstant.configFileName);
}
Future<String> getProfilesPath() async { Future<String> getProfilesPath() async {
final directory = await applicationSupportDirectoryCompleter.future; final directory = await applicationSupportDirectoryCompleter.future;
return join(directory.path, appConstant.profilesDirectoryName); return join(directory.path, profilesDirectoryName);
} }
Future<String?> getProfilePath(String? id) async { Future<String?> getProfilePath(String? id) async {
@@ -44,7 +39,7 @@ class AppPath {
Future<String> getMMDBPath() async { Future<String> getMMDBPath() async {
var directory = await applicationSupportDirectoryCompleter.future; var directory = await applicationSupportDirectoryCompleter.future;
return join(directory.path, appConstant.mmdbFileName); return join(directory.path, mmdbFileName);
} }
} }

43
lib/common/picker.dart Normal file
View File

@@ -0,0 +1,43 @@
import 'dart:io';
import 'package:file_picker/file_picker.dart';
import 'package:fl_clash/common/common.dart';
import 'package:image_picker/image_picker.dart';
import 'package:fl_clash/models/models.dart';
class Picker {
Future<Result<PlatformFile>> pickerConfigFile() async {
FilePickerResult? filePickerResult;
if (Platform.isAndroid) {
filePickerResult = await FilePicker.platform.pickFiles(
withData: true,
type: FileType.custom,
allowedExtensions: ['txt', 'conf'],
);
} else {
filePickerResult = await FilePicker.platform.pickFiles(
withData: true,
type: FileType.custom,
allowedExtensions: ['yaml', 'txt', 'conf'],
);
}
final file = filePickerResult?.files.first;
if (file == null) {
return Result.error(appLocalizations.pleaseUploadFile);
}
return Result.success(file);
}
Future<Result<String>> pickerConfigQRCode() async {
final xFile = await ImagePicker().pickImage(source: ImageSource.gallery);
final bytes = await xFile?.readAsBytes();
if (bytes == null) return Result.error();
final result = await other.parseQRCode(bytes);
if (result == null || !result.isUrl) {
return Result.error(appLocalizations.pleaseUploadValidQrcode);
}
return Result.success(result);
}
}
final picker = Picker();

View File

@@ -1,7 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'package:flutter/cupertino.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import '../models/models.dart'; import '../models/models.dart';
@@ -23,42 +22,40 @@ class Preferences {
Future<ClashConfig?> getClashConfig() async { Future<ClashConfig?> getClashConfig() async {
final preferences = await sharedPreferencesCompleter.future; final preferences = await sharedPreferencesCompleter.future;
final clashConfigString = preferences.getString(appConstant.clashKey); final clashConfigString = preferences.getString(clashConfigKey);
if (clashConfigString == null) return null; if (clashConfigString == null) return null;
final clashConfigMap = json.decode(clashConfigString); final clashConfigMap = json.decode(clashConfigString);
try { try {
return ClashConfig.fromJson(clashConfigMap); return ClashConfig.fromJson(clashConfigMap);
} catch (e) { } catch (e) {
debugPrint(e.toString()); throw e.toString();
return null;
} }
} }
Future<bool> saveClashConfig(ClashConfig clashConfig) async { Future<bool> saveClashConfig(ClashConfig clashConfig) async {
final preferences = await sharedPreferencesCompleter.future; final preferences = await sharedPreferencesCompleter.future;
return preferences.setString( return preferences.setString(
appConstant.clashKey, clashConfigKey,
json.encode(clashConfig), json.encode(clashConfig),
); );
} }
Future<Config?> getConfig() async { Future<Config?> getConfig() async {
final preferences = await sharedPreferencesCompleter.future; final preferences = await sharedPreferencesCompleter.future;
final configString = preferences.getString(appConstant.configKey); final configString = preferences.getString(configKey);
if (configString == null) return null; if (configString == null) return null;
final configMap = json.decode(configString); final configMap = json.decode(configString);
try { try {
return Config.fromJson(configMap); return Config.fromJson(configMap);
} catch (e) { } catch (e) {
debugPrint(e.toString()); throw e.toString();
return null;
} }
} }
Future<bool> saveConfig(Config config) async { Future<bool> saveConfig(Config config) async {
final preferences = await sharedPreferencesCompleter.future; final preferences = await sharedPreferencesCompleter.future;
return preferences.setString( return preferences.setString(
appConstant.configKey, configKey,
json.encode(config), json.encode(config),
); );
} }

View File

@@ -6,31 +6,31 @@ import '../models/models.dart';
class Request { class Request {
static Future<Result<Response>> getFileResponseForUrl(String url) async { static Future<Result<Response>> getFileResponseForUrl(String url) async {
final headers = {'User-Agent': appConstant.name}; final headers = {'User-Agent': coreName};
try { try {
final response = await get(Uri.parse(url), headers: headers).timeout( final response = await get(Uri.parse(url), headers: headers).timeout(
appConstant.httpTimeoutDuration, httpTimeoutDuration,
); );
return Result.success(data: response); return Result.success(response);
} catch (err) { } catch (err) {
return Result.error(message: err.toString()); return Result.error(err.toString());
} }
} }
static Future<Result<String>> checkForUpdate() async { static Future<Result<Map<String,dynamic>>> checkForUpdate() async {
final response = await get( final response = await get(
Uri.parse( Uri.parse(
"https://api.github.com/repos/${appConstant.repository}/releases/latest", "https://api.github.com/repos/$repository/releases/latest",
), ),
); );
if (response.statusCode != 200) return Result.error(); if (response.statusCode != 200) return Result.error();
final body = json.decode(response.body); final body = json.decode(response.body) as Map<String,dynamic>;
final remoteVersion = body['tag_name']; final remoteVersion = body['tag_name'];
final packageInfo = await appPackage.packageInfoCompleter.future; final packageInfo = await appPackage.packageInfoCompleter.future;
final version = packageInfo.version; final version = packageInfo.version;
final hasUpdate = final hasUpdate =
Other.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0; other.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
if (!hasUpdate) return Result.error(); if (!hasUpdate) return Result.error();
return Result.success(data: body['body']); return Result.success(body);
} }
} }

View File

@@ -1,10 +1,9 @@
import 'dart:async'; import 'dart:async';
import 'dart:io';
import 'dart:isolate';
import 'package:fl_clash/state.dart'; import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
import 'clash/core.dart'; import 'clash/core.dart';
import 'enum/enum.dart'; import 'enum/enum.dart';
@@ -35,13 +34,14 @@ class AppController {
config: config, config: config,
clashConfig: clashConfig, clashConfig: clashConfig,
); );
updateRunTime(); updateRunTime();
updateTraffic(); updateTraffic();
globalState.updateFunctionLists = [ globalState.updateFunctionLists = [
updateRunTime, updateRunTime,
updateTraffic, updateTraffic,
]; ];
clearShowProxyDelay();
testShowProxyDelay();
} else { } else {
await globalState.stopSystemProxy(); await globalState.stopSystemProxy();
appState.traffics = []; appState.traffics = [];
@@ -71,28 +71,10 @@ class AppController {
} }
changeProxy() { changeProxy() {
final currentGroupName = globalState.changeProxy(
appState.getCurrentGroupName(config.currentGroupName, clashConfig.mode); appState: appState,
final currentProxyName = config: config,
appState.getCurrentProxyName(config.currentProxyName, clashConfig.mode); clashConfig: clashConfig,
if (config.profiles.isEmpty || currentProxyName == null) {
updateSystemProxy(false);
return;
}
if (currentGroupName == null) return;
final groupIndex = appState.groups.indexWhere(
(element) => element.name == currentGroupName,
);
if (groupIndex == -1) return;
final proxyIndex = appState.groups[groupIndex].all.indexWhere(
(element) => element.name == currentProxyName,
);
if (proxyIndex == -1) return;
clashCore.changeProxy(
ChangeProxyParams(
groupName: currentGroupName,
proxyName: currentProxyName,
),
); );
} }
@@ -106,13 +88,7 @@ class AppController {
config.deleteProfileById(id); config.deleteProfileById(id);
final profilePath = await appPath.getProfilePath(id); final profilePath = await appPath.getProfilePath(id);
if (profilePath == null) return; if (profilePath == null) return;
final file = File(profilePath); clashCore.clearEffect(profilePath);
Isolate.run(() async {
final isExists = await file.exists();
if (isExists) {
file.delete();
}
});
if (config.currentProfileId == id) { if (config.currentProfileId == id) {
if (config.profiles.isNotEmpty) { if (config.profiles.isNotEmpty) {
final updateId = config.profiles.first.id; final updateId = config.profiles.first.id;
@@ -133,7 +109,7 @@ class AppController {
} }
} }
Future<bool> updateClashConfig({bool isPatch = true}) async { Future<String> updateClashConfig({bool isPatch = true}) async {
return await globalState.updateClashConfig( return await globalState.updateClashConfig(
clashConfig: clashConfig, clashConfig: clashConfig,
config: config, config: config,
@@ -141,12 +117,31 @@ class AppController {
); );
} }
Future applyProfile() async {
await globalState.applyProfile(
appState: appState,
config: config,
clashConfig: clashConfig,
);
}
Function? _changeProfileDebounce;
changeProfileDebounce(String? profileId) {
if (profileId == config.currentProfileId) return;
config.currentProfileId = profileId;
_changeProfileDebounce ??= debounce<Function(String?)>((profileId) async {
await applyProfile();
appState.delayMap = {};
saveConfigPreferences();
});
_changeProfileDebounce!([profileId]);
}
changeProfile(String? value) async { changeProfile(String? value) async {
if (value == config.currentProfileId) return; if (value == config.currentProfileId) return;
config.currentProfileId = value; config.currentProfileId = value;
await updateClashConfig(isPatch: false); await applyProfile();
updateGroups();
changeProxy();
appState.delayMap = {}; appState.delayMap = {};
saveConfigPreferences(); saveConfigPreferences();
} }
@@ -160,28 +155,18 @@ class AppController {
) )
.isBeforeNow(); .isBeforeNow();
if (isNotNeedUpdate == false) continue; if (isNotNeedUpdate == false) continue;
final result = await profile.update(); await profile.update();
if (result.type == ResultType.error) continue;
updateGroups();
changeProxy();
} }
} }
updateGroups() { Future<void> updateGroups() async {
globalState.updateGroups(appState); await globalState.updateGroups(appState);
} }
updateSystemColorSchemes(SystemColorSchemes systemColorSchemes) { updateSystemColorSchemes(SystemColorSchemes systemColorSchemes) {
appState.systemColorSchemes = systemColorSchemes; appState.systemColorSchemes = systemColorSchemes;
} }
clearCurrentDelay() {
final currentProxyName =
appState.getCurrentProxyName(config.currentProxyName, clashConfig.mode);
if (currentProxyName == null) return;
appState.setDelay(Delay(name: currentProxyName, value: null));
}
savePreferences() async { savePreferences() async {
await saveConfigPreferences(); await saveConfigPreferences();
await saveClashConfigPreferences(); await saveClashConfigPreferences();
@@ -224,30 +209,93 @@ class AppController {
} }
} }
afterInit() async { autoCheckUpdate() async {
if (appState.isInit) { if (!config.autoCheckUpdate) return;
changeProxy(); final res = await Request.checkForUpdate();
if (config.autoRun) { checkUpdateResultHandle(result: res);
await updateSystemProxy(true); }
} else {
await proxyManager.updateStartTime(); checkUpdateResultHandle({
await updateSystemProxy(proxyManager.isStart); Result<Map<String, dynamic>>? result,
} bool handleError = false
autoUpdateProfiles(); }) async {
updateLogStatus(); if (result == null) return;
if (!config.silentLaunch) { if (result.type == ResultType.success) {
window?.show(); final tagName = result.data?['tag_name'];
} final body = result.data?['body'];
final submits = other.parseReleaseBody(body);
globalState.showMessage(
title: appLocalizations.discoverNewVersion,
message: TextSpan(
text: "$tagName \n",
style: context.textTheme.headlineSmall,
children: [
TextSpan(
text: "\n",
style: context.textTheme.bodyMedium,
),
for (final submit in submits)
TextSpan(
text: "- $submit \n",
style: context.textTheme.bodyMedium,
),
],
),
onTab: () {
launchUrl(
Uri.parse("https://github.com/$repository/releases/latest"),
);
},
confirmText: appLocalizations.goDownload,
);
} else if(handleError){
globalState.showMessage(
title: appLocalizations.checkUpdate,
message: TextSpan(
text: appLocalizations.checkUpdateError,
),
);
} }
} }
afterInit() async {
if (config.autoRun) {
await updateSystemProxy(true);
} else {
await proxyManager.updateStartTime();
await updateSystemProxy(proxyManager.isStart);
}
autoUpdateProfiles();
updateLogStatus();
if (!config.silentLaunch) {
window?.show();
}
autoCheckUpdate();
}
healthcheck() {
if (globalState.healthcheckLock) return;
for (final delay in appState.delayMap.entries) {
setDelay(
Delay(
name: delay.key,
value: 0,
),
);
}
clashCore.healthcheck();
}
setDelay(Delay delay) { setDelay(Delay delay) {
appState.setDelay(delay); appState.setDelay(delay);
} }
updateDelayMap() async {
appState.delayMap = await clashCore.getDelayMap();
}
toPage(int index, {bool hasAnimate = false}) { toPage(int index, {bool hasAnimate = false}) {
final nextLabel = globalState.currentNavigationItems[index].label; appState.currentLabel = appState.currentNavigationItems[index].label;
appState.currentLabel = nextLabel;
if ((config.isAnimateToPage || hasAnimate)) { if ((config.isAnimateToPage || hasAnimate)) {
globalState.pageController?.animateToPage( globalState.pageController?.animateToPage(
index, index,
@@ -259,12 +307,8 @@ class AppController {
} }
} }
updatePackages() async {
await globalState.updatePackages(appState);
}
toProfiles() { toProfiles() {
final index = globalState.currentNavigationItems.indexWhere( final index = appState.currentNavigationItems.indexWhere(
(element) => element.label == "profiles", (element) => element.label == "profiles",
); );
if (index != -1) { if (index != -1) {
@@ -272,31 +316,6 @@ class AppController {
} }
} }
addProfileFormURL(String url) async {
globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
toProfiles();
final commonScaffoldState = globalState.homeScaffoldKey.currentState;
if (commonScaffoldState?.mounted != true) return;
commonScaffoldState?.loadingRun(
() async {
await Future.delayed(const Duration(milliseconds: 300));
final profile = Profile(
url: url,
);
final res = await profile.update();
if (res.type == ResultType.success) {
addProfile(profile);
} else {
debugPrint(res.message);
globalState.showMessage(
title: "${appLocalizations.add}${appLocalizations.profile}",
message: TextSpan(text: res.message!),
);
}
},
);
}
initLink() { initLink() {
linkManager.initAppLinksListen( linkManager.initAppLinksListen(
(url) { (url) {
@@ -326,8 +345,33 @@ class AppController {
); );
} }
addProfileFormURL(String url) async {
globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
toProfiles();
final commonScaffoldState = globalState.homeScaffoldKey.currentState;
if (commonScaffoldState?.mounted != true) return;
commonScaffoldState?.loadingRun(
() async {
await Future.delayed(const Duration(milliseconds: 300));
final profile = Profile(
url: url,
);
final res = await profile.update();
if (res.type == ResultType.success) {
addProfile(profile);
} else {
debugPrint(res.message);
globalState.showMessage(
title: "${appLocalizations.add}${appLocalizations.profile}",
message: TextSpan(text: res.message!),
);
}
},
);
}
addProfileFormFile() async { addProfileFormFile() async {
final result = await FileUtil.pickerConfig(); final result = await picker.pickerConfigFile();
if (result.type == ResultType.error) return; if (result.type == ResultType.error) return;
if (!context.mounted) return; if (!context.mounted) return;
globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst); globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
@@ -355,4 +399,45 @@ class AppController {
}, },
); );
} }
addProfileFormQrCode() async {
final result = await picker.pickerConfigQRCode();
if (result.type == ResultType.error) {
if (result.message != null) {
globalState.showMessage(
title: appLocalizations.tip,
message: TextSpan(
text: result.message,
),
);
}
return;
}
addProfileFormURL(result.data!);
}
clearShowProxyDelay() {
final showProxyDelay = appState.getRealProxyName(appState.showProxyName);
if (showProxyDelay != null) {
appState.setDelay(
Delay(name: showProxyDelay, value: null),
);
}
}
testShowProxyDelay() {
final showProxyDelay = appState.getRealProxyName(appState.showProxyName);
if (showProxyDelay != null) {
globalState.updateCurrentDelay(showProxyDelay);
}
}
updateViewWidth() {
appState.viewWidth = context.width;
if (appState.viewWidth == 0) {
Future.delayed(moreDuration, () {
updateViewWidth();
});
}
}
} }

View File

@@ -2,6 +2,8 @@
enum GroupType { Selector, URLTest, Fallback } enum GroupType { Selector, URLTest, Fallback }
enum GroupName { GLOBAL, Proxy, Auto, Fallback }
extension GroupTypeExtension on GroupType { extension GroupTypeExtension on GroupType {
static List<String> get valueList => GroupType.values static List<String> get valueList => GroupType.values
.map( .map(
@@ -9,8 +11,7 @@ extension GroupTypeExtension on GroupType {
) )
.toList(); .toList();
static GroupType? getGroupType(String? value) { static GroupType? getGroupType(String value) {
if (value == null) return null;
final index = GroupTypeExtension.valueList.indexOf(value); final index = GroupTypeExtension.valueList.indexOf(value);
if (index == -1) return null; if (index == -1) return null;
return GroupType.values[index]; return GroupType.values[index];
@@ -33,6 +34,8 @@ extension UsedProxyExtension on UsedProxy {
enum Mode { rule, global, direct } enum Mode { rule, global, direct }
enum ViewMode { mobile, laptop, desktop }
enum LogLevel { debug, info, warning, error, silent } enum LogLevel { debug, info, warning, error, silent }
enum TransportProtocol { udp, tcp } enum TransportProtocol { udp, tcp }
@@ -53,4 +56,9 @@ enum ProfileType { file, url }
enum ResultType { success, error } enum ResultType { success, error }
enum MessageType { log, tun, delay, process } enum MessageType { log, tun, delay, process, now }
enum RecoveryOption {
all,
onlyProfiles,
}

View File

@@ -1,4 +1,5 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/common.dart';
import 'package:fl_clash/state.dart'; import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:package_info_plus/package_info_plus.dart'; import 'package:package_info_plus/package_info_plus.dart';
@@ -7,6 +8,20 @@ import 'package:url_launcher/url_launcher.dart';
class AboutFragment extends StatelessWidget { class AboutFragment extends StatelessWidget {
const AboutFragment({super.key}); const AboutFragment({super.key});
_checkUpdate(BuildContext context) async {
final commonScaffoldState = context.commonScaffoldState;
if (commonScaffoldState?.mounted != true) return;
final res =
await commonScaffoldState?.loadingRun<Result<Map<String, dynamic>>>(
Request.checkForUpdate,
title: appLocalizations.checkUpdate,
);
globalState.appController.checkUpdateResultHandle(
result: res,
handleError: true,
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ListView( return ListView(
@@ -32,7 +47,7 @@ class AboutFragment extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
appConstant.name, appName,
style: Theme.of(context).textTheme.headlineSmall, style: Theme.of(context).textTheme.headlineSmall,
), ),
FutureBuilder<PackageInfo>( FutureBuilder<PackageInfo>(
@@ -66,25 +81,23 @@ class AboutFragment extends StatelessWidget {
ListTile( ListTile(
title: Text(appLocalizations.checkUpdate), title: Text(appLocalizations.checkUpdate),
onTap: () { onTap: () {
final commonScaffoldState = context.commonScaffoldState; _checkUpdate(context);
if (commonScaffoldState?.mounted != true) return;
commonScaffoldState?.loadingRun(() async {
await globalState.checkUpdate(
() {
launchUrl(
Uri.parse(
"https://github.com/${appConstant.repository}/releases/latest"),
);
},
);
});
}, },
), ),
ListTile(
title: const Text("Telegram"),
onTap: () {
launchUrl(
Uri.parse("https://t.me/+G-veVtwBOl4wODc1"),
);
},
trailing: const Icon(Icons.launch),
),
ListTile( ListTile(
title: Text(appLocalizations.project), title: Text(appLocalizations.project),
onTap: () { onTap: () {
launchUrl( launchUrl(
Uri.parse("https://github.com/${appConstant.repository}"), Uri.parse("https://github.com/$repository"),
); );
}, },
trailing: const Icon(Icons.launch), trailing: const Icon(Icons.launch),

View File

@@ -1,62 +1,31 @@
import 'package:collection/collection.dart';
import 'package:fl_clash/enum/enum.dart'; import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/plugins/app.dart'; import 'package:fl_clash/plugins/app.dart';
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/widgets.dart'; import 'package:fl_clash/widgets/widgets.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class AccessFragment extends StatelessWidget { class AccessFragment extends StatefulWidget {
const AccessFragment({super.key}); const AccessFragment({super.key});
Widget _buildPackageItem({ @override
required Package package, State<AccessFragment> createState() => _AccessFragmentState();
required bool value, }
required bool isActive,
required void Function(bool?) onChanged, class _AccessFragmentState extends State<AccessFragment> {
}) { final packagesListenable = ValueNotifier<List<Package>>([]);
return AbsorbPointer(
absorbing: !isActive, @override
child: ListItem.checkbox( void initState() {
leading: SizedBox( super.initState();
width: 48, WidgetsBinding.instance.addPostFrameCallback((_) {
height: 48, Future.delayed(const Duration(milliseconds: 300), () async {
child: FutureBuilder<ImageProvider?>( packagesListenable.value = await app?.getPackages() ?? [];
future: app?.getPackageIcon(package.packageName), });
builder: (_, snapshot) { });
if (!snapshot.hasData && snapshot.data == null) {
return Container();
} else {
return Image(
image: snapshot.data!,
gaplessPlayback: true,
width: 48,
height: 48,
);
}
},
),
),
title: Text(
package.label,
style: const TextStyle(
overflow: TextOverflow.ellipsis,
),
maxLines: 1,
),
subtitle: Text(
package.packageName,
style: const TextStyle(
overflow: TextOverflow.ellipsis,
),
maxLines: 1,
),
delegate: CheckboxDelegate(
value: value,
onChanged: onChanged,
),
),
);
} }
Widget _buildAppProxyModePopup() { Widget _buildAppProxyModePopup() {
@@ -126,13 +95,28 @@ class AccessFragment extends StatelessWidget {
return IconButton( return IconButton(
tooltip: tooltip, tooltip: tooltip,
onPressed: () { onPressed: () {
final config = context.read<Config>(); final config = globalState.appController.config;
final isAccept =
config.accessControl.mode == AccessControlMode.acceptSelected;
if (isSelectedAll) { if (isSelectedAll) {
config.accessControl.currentList = []; config.accessControl = switch (isAccept) {
config.accessControl = config.accessControl.copyWith(); true => config.accessControl.copyWith(
acceptList: [],
),
false => config.accessControl.copyWith(
rejectList: [],
),
};
} else { } else {
config.accessControl.currentList = allValueList; config.accessControl = switch (isAccept) {
config.accessControl = config.accessControl.copyWith(); true => config.accessControl.copyWith(
acceptList: allValueList,
),
false => config.accessControl.copyWith(
rejectList: allValueList,
),
};
} }
}, },
icon: isSelectedAll icon: isSelectedAll
@@ -143,148 +127,182 @@ class AccessFragment extends StatelessWidget {
); );
} }
Widget _buildPackageList(bool isAccessControl) { Widget _actionHeader({
return Selector2<AppState, Config, PackageListSelectorState>( required bool isAccessControl,
selector: (_, appState, config) => PackageListSelectorState( required List<String> valueList,
accessControl: config.accessControl, required String describe,
packages: appState.packages, required List<String> packageNameList,
), }) {
builder: (context, state, __) { return AbsorbPointer(
final accessControl = state.accessControl; absorbing: !isAccessControl,
final isFilterSystemApp = accessControl.isFilterSystemApp; child: Padding(
final packages = isFilterSystemApp padding: const EdgeInsets.only(
? state.packages top: 4,
.where((element) => element.isSystem == false) bottom: 4,
.toList() left: 16,
: state.packages; right: 8,
final packageNameList = packages.map((e) => e.packageName).toList(); ),
final accessControlMode = accessControl.mode; child: Row(
final valueList = mainAxisAlignment: MainAxisAlignment.spaceBetween,
accessControl.currentList.intersection(packageNameList); mainAxisSize: MainAxisSize.max,
final describe = accessControlMode == AccessControlMode.acceptSelected children: [
? appLocalizations.accessControlAllowDesc Expanded(
: appLocalizations.accessControlNotAllowDesc; child: IntrinsicHeight(
child: Column(
final listView = ListView.builder( mainAxisSize: MainAxisSize.max,
itemCount: packages.length, crossAxisAlignment: CrossAxisAlignment.start,
itemBuilder: (_, index) { children: [
final package = packages[index]; Expanded(
return _buildPackageItem( child: Row(
package: package,
value: valueList.contains(package.packageName),
isActive: isAccessControl,
onChanged: (value) {
if (value == true) {
valueList.add(package.packageName);
} else {
valueList.remove(package.packageName);
}
final config = context.read<Config>();
config.accessControl.currentList = valueList;
config.accessControl = config.accessControl.copyWith();
},
);
},
);
return DisabledMask(
status: !isAccessControl,
child: Column(
children: [
AbsorbPointer(
absorbing: !isAccessControl,
child: Padding(
padding: const EdgeInsets.only(
top: 4,
bottom: 4,
left: 16,
right: 8,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.max,
children: [
Expanded(
child: IntrinsicHeight(
child: Column(
mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Row(
children: [
Flexible(
child: Text(
appLocalizations.selected,
style: Theme.of(context)
.textTheme
.labelLarge
?.copyWith(
color: Theme.of(context)
.colorScheme
.primary,
),
),
),
const Flexible(
child: SizedBox(
width: 8,
),
),
Flexible(
child: Text(
"${valueList.length}",
style: Theme.of(context)
.textTheme
.labelLarge
?.copyWith(
color: Theme.of(context)
.colorScheme
.primary,
),
),
),
],
),
),
Flexible(
child: Text(describe),
)
],
),
),
),
Row(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
Flexible( Flexible(
child: _buildSelectedAllButton( child: Text(
isSelectedAll: appLocalizations.selected,
valueList.length == packageNameList.length, style: Theme.of(context)
allValueList: packageNameList, .textTheme
.labelLarge
?.copyWith(
color:
Theme.of(context).colorScheme.primary,
),
),
),
const Flexible(
child: SizedBox(
width: 8,
),
),
Flexible(
child: Text(
"${valueList.length}",
style: Theme.of(context)
.textTheme
.labelLarge
?.copyWith(
color:
Theme.of(context).colorScheme.primary,
),
), ),
), ),
Flexible(child: _buildFilterSystemAppButton()),
Flexible(child: _buildAppProxyModePopup()),
], ],
), ),
], ),
Flexible(
child: Text(describe),
)
],
),
),
),
Row(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.end,
children: [
Flexible(
child: _buildSelectedAllButton(
isSelectedAll: const ListEquality<String>()
.equals(valueList, packageNameList),
allValueList: packageNameList,
), ),
), ),
), Flexible(child: _buildFilterSystemAppButton()),
Flexible( Flexible(child: _buildAppProxyModePopup()),
flex: 1, ],
child: FadeBox( ),
child: packages.isEmpty ],
? const Center( ),
child: CircularProgressIndicator(), ),
) );
: listView, }
),
), Widget _buildPackageList() {
], return ValueListenableBuilder(
valueListenable: packagesListenable,
builder: (_, packages, ___) {
return Selector<Config, PackageListSelectorState>(
selector: (_, config) => PackageListSelectorState(
accessControl: config.accessControl,
isAccessControl: config.isAccessControl,
), ),
builder: (context, state, __) {
final accessControl = state.accessControl;
final isAccessControl = state.isAccessControl;
final isFilterSystemApp = accessControl.isFilterSystemApp;
final currentPackages = isFilterSystemApp
? packages
.where((element) => element.isSystem == false)
.toList()
: packages;
final packageNameList =
currentPackages.map((e) => e.packageName).toList();
final accessControlMode = accessControl.mode;
final currentList =
accessControlMode == AccessControlMode.acceptSelected
? accessControl.acceptList
: accessControl.rejectList;
final valueList = currentList.intersection(packageNameList);
final describe =
accessControlMode == AccessControlMode.acceptSelected
? appLocalizations.accessControlAllowDesc
: appLocalizations.accessControlNotAllowDesc;
return DisabledMask(
status: !isAccessControl,
child: Column(
children: [
_actionHeader(
isAccessControl: isAccessControl,
valueList: valueList,
describe: describe,
packageNameList: packageNameList,
),
Expanded(
flex: 1,
child: FadeBox(
key: const Key("fade_box"),
child: currentPackages.isEmpty
? const Center(
child: CircularProgressIndicator(),
)
: ListView.builder(
itemCount: currentPackages.length,
itemBuilder: (_, index) {
final package = currentPackages[index];
return PackageListItem(
key: Key(package.packageName),
package: package,
value:
valueList.contains(package.packageName),
isActive: isAccessControl,
onChanged: (value) {
if (value == true) {
valueList.add(package.packageName);
} else {
valueList.remove(package.packageName);
}
final config =
globalState.appController.config;
if (accessControlMode ==
AccessControlMode.acceptSelected) {
config.accessControl =
config.accessControl.copyWith(
acceptList: valueList,
);
} else {
config.accessControl =
config.accessControl.copyWith(
rejectList: valueList,
);
}
},
);
},
),
),
),
],
),
);
},
); );
}, },
); );
@@ -292,14 +310,9 @@ class AccessFragment extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (context.appController.appState.packages.isEmpty) {
WidgetsBinding.instance.addPostFrameCallback((_) {
context.appController.updatePackages();
});
}
return Selector<Config, bool>( return Selector<Config, bool>(
selector: (_, config) => config.isAccessControl, selector: (_, config) => config.isAccessControl,
builder: (_, isAccessControl, __) { builder: (_, isAccessControl, child) {
return Column( return Column(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: [ children: [
@@ -323,11 +336,73 @@ class AccessFragment extends StatelessWidget {
), ),
), ),
Flexible( Flexible(
child: _buildPackageList(isAccessControl), child: child!,
), ),
], ],
); );
}, },
child: _buildPackageList(),
);
}
}
class PackageListItem extends StatelessWidget {
final Package package;
final bool value;
final bool isActive;
final void Function(bool?) onChanged;
const PackageListItem({
super.key,
required this.package,
required this.value,
required this.isActive,
required this.onChanged,
});
@override
Widget build(BuildContext context) {
return AbsorbPointer(
absorbing: !isActive,
child: ListItem.checkbox(
leading: SizedBox(
width: 48,
height: 48,
child: FutureBuilder<ImageProvider?>(
future: app?.getPackageIcon(package.packageName),
builder: (_, snapshot) {
if (!snapshot.hasData && snapshot.data == null) {
return Container();
} else {
return Image(
image: snapshot.data!,
gaplessPlayback: true,
width: 48,
height: 48,
);
}
},
),
),
title: Text(
package.label,
style: const TextStyle(
overflow: TextOverflow.ellipsis,
),
maxLines: 1,
),
subtitle: Text(
package.packageName,
style: const TextStyle(
overflow: TextOverflow.ellipsis,
),
maxLines: 1,
),
delegate: CheckboxDelegate(
value: value,
onChanged: onChanged,
),
),
); );
} }
} }

View File

@@ -2,6 +2,7 @@ import 'dart:io';
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/widgets.dart'; import 'package:fl_clash/widgets/widgets.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
@@ -88,24 +89,6 @@ class ApplicationSettingFragment extends StatelessWidget {
); );
}, },
), ),
Selector<Config, bool>(
selector: (_, config) => config.openLogs,
builder: (_, openLogs, child) {
return ListItem.switchItem(
leading: const Icon(Icons.bug_report),
title: Text(appLocalizations.logcat),
subtitle: Text(appLocalizations.logcatDesc),
delegate: SwitchDelegate(
value: openLogs,
onChanged: (bool value) {
final config = context.read<Config>();
config.openLogs = value;
context.appController.updateLogStatus();
},
),
);
},
),
if (Platform.isAndroid) if (Platform.isAndroid)
Selector<Config, bool>( Selector<Config, bool>(
selector: (_, config) => config.isAnimateToPage, selector: (_, config) => config.isAnimateToPage,
@@ -124,6 +107,41 @@ class ApplicationSettingFragment extends StatelessWidget {
); );
}, },
), ),
Selector<Config, bool>(
selector: (_, config) => config.openLogs,
builder: (_, openLogs, child) {
return ListItem.switchItem(
leading: const Icon(Icons.bug_report),
title: Text(appLocalizations.logcat),
subtitle: Text(appLocalizations.logcatDesc),
delegate: SwitchDelegate(
value: openLogs,
onChanged: (bool value) {
final config = context.read<Config>();
config.openLogs = value;
globalState.appController.updateLogStatus();
},
),
);
},
),
Selector<Config, bool>(
selector: (_, config) => config.autoCheckUpdate,
builder: (_, autoCheckUpdate, child) {
return ListItem.switchItem(
leading: const Icon(Icons.system_update),
title: Text(appLocalizations.autoCheckUpdate),
subtitle: Text(appLocalizations.autoCheckUpdateDesc),
delegate: SwitchDelegate(
value: autoCheckUpdate,
onChanged: (bool value) {
final config = context.read<Config>();
config.autoCheckUpdate = value;
},
),
);
},
),
]; ];
return ListView.separated( return ListView.separated(
itemBuilder: (_, index) { itemBuilder: (_, index) {

View File

@@ -0,0 +1,362 @@
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/common/dav_client.dart';
import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/models/config.dart';
import 'package:fl_clash/models/dav.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/fade_box.dart';
import 'package:fl_clash/widgets/list.dart';
import 'package:fl_clash/widgets/section.dart';
import 'package:fl_clash/widgets/text.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class BackupAndRecovery extends StatefulWidget {
const BackupAndRecovery({super.key});
@override
State<BackupAndRecovery> createState() => _BackupAndRecoveryState();
}
class _BackupAndRecoveryState extends State<BackupAndRecovery> {
DAVClient? _client;
_showAddWebDAV(DAV? dav) async {
await globalState.showCommonDialog<String>(
child: WebDAVFormDialog(
dav: dav?.copyWith(),
),
);
}
_backup() async {
final commonScaffoldState = context.commonScaffoldState;
final res = await commonScaffoldState?.loadingRun<bool>(() async {
return await _client?.backup();
});
if(res != true) return;
globalState.showMessage(
title: appLocalizations.recovery,
message: TextSpan(text: appLocalizations.backupSuccess),
);
}
_recovery(RecoveryOption recoveryOption) async {
final commonScaffoldState = context.commonScaffoldState;
final res = await commonScaffoldState?.loadingRun<bool>(() async {
return await _client?.recovery(recoveryOption: recoveryOption);
});
if(res != true) return;
globalState.showMessage(
title: appLocalizations.recovery,
message: TextSpan(text: appLocalizations.recoverySuccess),
);
}
_handleRecovery() async {
final recoveryOption = await globalState.showCommonDialog<RecoveryOption>(
child: const RecoveryOptionsDialog(),
);
if (recoveryOption == null) return;
_recovery(recoveryOption);
}
@override
Widget build(BuildContext context) {
return Selector<Config, DAV?>(
selector: (_, config) => config.dav,
builder: (_, dav, __) {
if (dav == null) {
return ListView(
children: [
Section(
title: appLocalizations.account,
child: Builder(
builder: (_) {
return ListItem(
leading: const Icon(Icons.account_box),
title: Text(appLocalizations.noInfo),
subtitle: Text(appLocalizations.pleaseBindWebDAV),
trailing: FilledButton.tonal(
onPressed: () {
_showAddWebDAV(dav);
},
child: Text(
appLocalizations.bind,
),
),
);
},
),
)
],
);
}
_client = DAVClient(dav);
final pingFuture = _client!.pingCompleter.future;
return ListView(
children: [
Section(
title: appLocalizations.account,
child: ListItem(
leading: const Icon(Icons.account_box),
title: TooltipText(
text: Text(
dav.user,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
subtitle: Padding(
padding: const EdgeInsets.symmetric(vertical: 4),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(appLocalizations.connectivity),
FutureBuilder<bool>(
future: pingFuture,
builder: (_, snapshot) {
return Center(
child: FadeBox(
key: const Key("fade_box_1"),
child: snapshot.connectionState ==
ConnectionState.waiting
? const SizedBox(
width: 12,
height: 12,
child: CircularProgressIndicator(
strokeWidth: 1,
),
)
: Container(
decoration: BoxDecoration(
shape: BoxShape.circle,
color: snapshot.data == true
? Colors.green
: Colors.red,
),
width: 12,
height: 12,
),
),
);
},
),
],
),
),
trailing: FilledButton.tonal(
onPressed: () {
_showAddWebDAV(dav);
},
child: Text(
appLocalizations.edit,
),
),
),
),
FutureBuilder<bool>(
future: pingFuture,
builder: (_, snapshot) {
return FadeBox(
key: const Key("fade_box_2"),
child: snapshot.data == true
? Section(
title: appLocalizations.backupAndRecovery,
child: Column(
children: [
ListItem(
onTab: _backup,
title: Text(appLocalizations.backup),
subtitle: Text(appLocalizations.backupDesc),
),
ListItem(
onTab: _handleRecovery,
title: Text(appLocalizations.recovery),
subtitle: Text(appLocalizations.recoveryDesc),
),
],
),
)
: Container(),
);
},
),
],
);
},
);
}
}
class WebDAVFormDialog extends StatefulWidget {
final DAV? dav;
const WebDAVFormDialog({super.key, this.dav});
@override
State<WebDAVFormDialog> createState() => _WebDAVFormDialogState();
}
class _WebDAVFormDialogState extends State<WebDAVFormDialog> {
late TextEditingController uriController;
late TextEditingController userController;
late TextEditingController passwordController;
final _obscureController = ValueNotifier<bool>(true);
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
@override
void initState() {
super.initState();
uriController = TextEditingController(text: widget.dav?.uri);
userController = TextEditingController(text: widget.dav?.user);
passwordController = TextEditingController(text: widget.dav?.password);
}
_submit() {
if (!_formKey.currentState!.validate()) return;
globalState.appController.config.dav = DAV(
uri: uriController.text,
user: userController.text,
password: passwordController.text,
);
Navigator.pop(context);
}
_delete() {
globalState.appController.config.dav = null;
Navigator.pop(context);
}
@override
Widget build(BuildContext context) {
return AlertDialog(
title: Text(appLocalizations.webDAVConfiguration),
content: Form(
key: _formKey,
child: SizedBox(
width: dialogCommonWidth,
child: Wrap(
runSpacing: 16,
children: [
TextFormField(
controller: uriController,
maxLines: 2,
minLines: 1,
decoration: InputDecoration(
prefixIcon: const Icon(Icons.link),
border: const OutlineInputBorder(),
labelText: appLocalizations.address,
helperText: appLocalizations.addressHelp,
),
validator: (String? value) {
if (value == null || value.isEmpty || !value.isUrl) {
return appLocalizations.addressTip;
}
return null;
},
),
TextFormField(
controller: userController,
decoration: InputDecoration(
prefixIcon: const Icon(Icons.account_circle),
border: const OutlineInputBorder(),
labelText: appLocalizations.account,
),
validator: (String? value) {
if (value == null || value.isEmpty) {
return appLocalizations.accountTip;
}
return null;
},
),
ValueListenableBuilder(
valueListenable: _obscureController,
builder: (_, obscure, __) {
return TextFormField(
controller: passwordController,
obscureText: obscure,
decoration: InputDecoration(
prefixIcon: const Icon(Icons.password),
border: const OutlineInputBorder(),
suffixIcon: IconButton(
icon: Icon(
obscure ? Icons.visibility : Icons.visibility_off,
),
onPressed: () {
_obscureController.value = !obscure;
},
),
labelText: appLocalizations.password,
),
validator: (String? value) {
if (value == null || value.isEmpty) {
return appLocalizations.passwordTip;
}
return null;
},
);
},
),
],
),
),
),
actions: [
if (widget.dav != null)
TextButton(
onPressed: _delete,
child: Text(appLocalizations.delete),
),
TextButton(
onPressed: _submit,
child: Text(appLocalizations.save),
)
],
);
}
}
class RecoveryOptionsDialog extends StatefulWidget {
const RecoveryOptionsDialog({super.key});
@override
State<RecoveryOptionsDialog> createState() => _RecoveryOptionsDialogState();
}
class _RecoveryOptionsDialogState extends State<RecoveryOptionsDialog> {
_handleOnTab(RecoveryOption? value) {
if (value == null) return;
Navigator.of(context).pop(value);
}
@override
Widget build(BuildContext context) {
return AlertDialog(
title: Text(appLocalizations.recovery),
contentPadding: const EdgeInsets.symmetric(
horizontal: 8,
vertical: 16,
),
content: SizedBox(
width: 250,
child: Wrap(
children: [
ListItem(
onTab: () {
_handleOnTab(RecoveryOption.onlyProfiles);
},
title: Text(appLocalizations.recoveryProfiles),
),
ListItem(
onTab: () {
_handleOnTab(RecoveryOption.all);
},
title: Text(appLocalizations.recoveryAll),
)
],
),
),
);
}
}

View File

@@ -24,8 +24,8 @@ class _ConfigFragmentState extends State<ConfigFragment> {
try { try {
final mixedPort = int.parse(port); final mixedPort = int.parse(port);
if (mixedPort < 1024 || mixedPort > 49151) throw "Invalid port"; if (mixedPort < 1024 || mixedPort > 49151) throw "Invalid port";
context.appController.clashConfig.mixedPort = mixedPort; globalState.appController.clashConfig.mixedPort = mixedPort;
context.appController.updateClashConfigDebounce(); globalState.appController.updateClashConfigDebounce();
} catch (e) { } catch (e) {
globalState.showMessage( globalState.showMessage(
title: appLocalizations.proxyPort, title: appLocalizations.proxyPort,
@@ -39,32 +39,14 @@ class _ConfigFragmentState extends State<ConfigFragment> {
_updateLoglevel(LogLevel? logLevel) { _updateLoglevel(LogLevel? logLevel) {
if (logLevel == null || if (logLevel == null ||
logLevel == context.appController.clashConfig.logLevel) return; logLevel == globalState.appController.clashConfig.logLevel) return;
context.appController.clashConfig.logLevel = logLevel; globalState.appController.clashConfig.logLevel = logLevel;
context.appController.updateClashConfigDebounce(); globalState.appController.updateClashConfigDebounce();
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
List<Widget> items = [ List<Widget> items = [
Selector<ClashConfig, bool>(
selector: (_, clashConfig) => clashConfig.allowLan,
builder: (_, allowLan, __) {
return ListItem.switchItem(
leading: const Icon(Icons.device_hub),
title: Text(appLocalizations.allowLan),
subtitle: Text(appLocalizations.allowLanDesc),
delegate: SwitchDelegate(
value: allowLan,
onChanged: (bool value) async {
final clashConfig = context.read<ClashConfig>();
clashConfig.allowLan = value;
context.appController.updateClashConfigDebounce();
},
),
);
},
),
Selector<ClashConfig, int>( Selector<ClashConfig, int>(
selector: (_, clashConfig) => clashConfig.mixedPort, selector: (_, clashConfig) => clashConfig.mixedPort,
builder: (_, mixedPort, __) { builder: (_, mixedPort, __) {
@@ -72,6 +54,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
onTab: () { onTab: () {
_modifyMixedPort(mixedPort); _modifyMixedPort(mixedPort);
}, },
padding: const EdgeInsets.symmetric(horizontal: 16,vertical: 4),
leading: const Icon(Icons.adjust), leading: const Icon(Icons.adjust),
title: Text(appLocalizations.proxyPort), title: Text(appLocalizations.proxyPort),
trailing: FilledButton.tonal( trailing: FilledButton.tonal(
@@ -85,42 +68,101 @@ class _ConfigFragmentState extends State<ConfigFragment> {
); );
}, },
), ),
Selector<ClashConfig, LogLevel>( Selector<ClashConfig, bool>(
selector: (_, clashConfig) => clashConfig.logLevel, selector: (_, clashConfig) => clashConfig.allowLan,
builder: (_, value, __) { builder: (_, allowLan, __) {
return ListItem( return ListItem.switchItem(
leading: const Icon(Icons.feedback), leading: const Icon(Icons.device_hub),
title: Text(appLocalizations.logLevel), title: Text(appLocalizations.allowLan),
trailing: SizedBox( subtitle: Text(appLocalizations.allowLanDesc),
height: 48, delegate: SwitchDelegate(
child: DropdownMenu<LogLevel>( value: allowLan,
width: 124, onChanged: (bool value) async {
inputDecorationTheme: const InputDecorationTheme( final clashConfig = context.read<ClashConfig>();
filled: true, clashConfig.allowLan = value;
contentPadding: EdgeInsets.symmetric( globalState.appController.updateClashConfigDebounce();
vertical: 5, },
horizontal: 16,
),
),
initialSelection: value,
dropdownMenuEntries: [
for (final logLevel in LogLevel.values)
DropdownMenuEntry<LogLevel>(
value: logLevel,
label: logLevel.name,
)
],
onSelected: _updateLoglevel,
),
), ),
); );
}, },
), ),
if (system.isDesktop)
Selector<ClashConfig, bool>(
selector: (_, clashConfig) => clashConfig.tun.enable,
builder: (_, tunEnable, __) {
return ListItem.switchItem(
leading: const Icon(Icons.support),
title: Text(appLocalizations.tun),
subtitle: Text(appLocalizations.tunDesc),
delegate: SwitchDelegate(
value: tunEnable,
onChanged: (bool value) async {
final clashConfig = context.read<ClashConfig>();
clashConfig.tun = Tun(enable: value);
globalState.appController.updateClashConfigDebounce();
},
),
);
},
),
Selector<Config, bool>(
selector: (_, config) => config.isCompatible,
builder: (_, isCompatible, __) {
return ListItem.switchItem(
leading: const Icon(Icons.expand),
title: Text(appLocalizations.compatible),
subtitle: Text(appLocalizations.compatibleDesc),
delegate: SwitchDelegate(
value: isCompatible,
onChanged: (bool value) async {
final appController = globalState.appController;
appController.config.isCompatible = value;
await appController.updateClashConfig(isPatch: false);
await appController.updateGroups();
appController.changeProxy();
},
),
);
},
),
Padding(
padding: kMaterialListPadding,
child: Selector<ClashConfig, LogLevel>(
selector: (_, clashConfig) => clashConfig.logLevel,
builder: (_, value, __) {
return ListItem(
leading: const Icon(Icons.feedback),
title: Text(appLocalizations.logLevel),
trailing: SizedBox(
height: 48,
child: DropdownMenu<LogLevel>(
width: 124,
inputDecorationTheme: const InputDecorationTheme(
filled: true,
contentPadding: EdgeInsets.symmetric(
vertical: 5,
horizontal: 16,
),
),
initialSelection: value,
dropdownMenuEntries: [
for (final logLevel in LogLevel.values)
DropdownMenuEntry<LogLevel>(
value: logLevel,
label: logLevel.name,
)
],
onSelected: _updateLoglevel,
),
),
);
},
),
),
]; ];
return ListView.separated( return ListView.separated(
itemBuilder: (_, index) { itemBuilder: (_, index) {
return Container( return Container(
height: 84,
alignment: Alignment.center, alignment: Alignment.center,
child: items[index], child: items[index],
); );

View File

@@ -12,7 +12,6 @@ class CoreInfo extends StatelessWidget {
return Selector<AppState, VersionInfo?>( return Selector<AppState, VersionInfo?>(
selector: (_, appState) => appState.versionInfo, selector: (_, appState) => appState.versionInfo,
builder: (_, versionInfo, __) { builder: (_, versionInfo, __) {
debugPrint("[CoreInfo] update===>");
return CommonCard( return CommonCard(
info: Info( info: Info(
label: appLocalizations.coreInfo, label: appLocalizations.coreInfo,

View File

@@ -1,6 +1,8 @@
import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/models/models.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
import 'package:fl_clash/widgets/widgets.dart'; import 'package:fl_clash/widgets/widgets.dart';
import 'package:provider/provider.dart';
import 'network_detection.dart'; import 'network_detection.dart';
import 'core_info.dart'; import 'core_info.dart';
@@ -17,63 +19,51 @@ class DashboardFragment extends StatefulWidget {
} }
class _DashboardFragmentState extends State<DashboardFragment> { class _DashboardFragmentState extends State<DashboardFragment> {
_buildGrid(bool isDesktop) {
return SingleChildScrollView(
padding: const EdgeInsets.all(16),
child: Grid(
crossAxisCount: 12,
crossAxisSpacing: 16,
mainAxisSpacing: 16,
children: [
GridItem(
crossAxisCellCount: isDesktop ? 8 : 12,
child: const NetworkSpeed(),
),
GridItem(
crossAxisCellCount: isDesktop ? 4 : 6,
child: const OutboundMode(),
),
GridItem(
crossAxisCellCount: isDesktop ? 4 : 6,
child: const NetworkDetection(),
),
GridItem(
crossAxisCellCount: isDesktop ? 4 : 6,
child: const TrafficUsage(),
),
GridItem(
crossAxisCellCount: isDesktop ? 4 : 6,
child: const CoreInfo(),
),
],
),
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return LayoutBuilder(builder: (_, container) { return FloatLayout(
if (container.maxWidth < 200) return Container(); floatingWidget: const FloatWrapper(
return FloatLayout( child: StartButton(),
floatingWidget: const FloatWrapper( ),
child: StartButton(), child: Align(
), alignment: Alignment.topCenter,
child: Align( child: SingleChildScrollView(
alignment: Alignment.topCenter, padding: const EdgeInsets.all(16),
child: SlotLayout( child: Selector<AppState, ViewMode>(
config: { selector: (_, appState) => appState.viewMode,
Breakpoints.small: SlotLayout.from( builder: (_, viewMode, ___) {
key: const Key('dashboard_small'), final isDesktop = viewMode == ViewMode.desktop;
builder: (_) => _buildGrid(false), return Grid(
), crossAxisCount: 12,
Breakpoints.mediumAndUp: SlotLayout.from( crossAxisSpacing: 16,
key: const Key('dashboard_mediumAndUp'), mainAxisSpacing: 16,
builder: (_) => _buildGrid(true), children: [
), GridItem(
crossAxisCellCount: isDesktop ? 8 : 12,
child: const NetworkSpeed(),
),
GridItem(
crossAxisCellCount: isDesktop ? 4 : 6,
child: const OutboundMode(),
),
GridItem(
crossAxisCellCount: isDesktop ? 4 : 6,
child: const NetworkDetection(),
),
GridItem(
crossAxisCellCount: isDesktop ? 4 : 6,
child: const TrafficUsage(),
),
GridItem(
crossAxisCellCount: isDesktop ? 4 : 6,
child: const CoreInfo(),
),
],
);
}, },
), ),
), ),
); ),
}); );
} }
} }

View File

@@ -73,57 +73,6 @@ class _NetworkDetectionState extends State<NetworkDetection> {
); );
} }
_updateCurrentDelay(
String? currentProxyName,
int? delay,
bool isCurrent,
bool isInit,
) {
if (!isCurrent || currentProxyName == null || !isInit) return;
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
if (delay == null) {
context.appController.setDelay(
Delay(
name: currentProxyName,
value: 0,
),
);
globalState.updateCurrentDelay(
currentProxyName,
);
}
});
}
_updateCurrentDelayContainer(Widget child) {
return Selector3<AppState, Config, ClashConfig,
UpdateCurrentDelaySelectorState>(
selector: (_, appState, config, clashConfig) {
final proxyName = appState.getCurrentProxyName(
config.currentProxyName,
clashConfig.mode,
);
return UpdateCurrentDelaySelectorState(
isInit: appState.isInit,
currentProxyName: proxyName,
delay: appState.delayMap[proxyName],
isCurrent: appState.currentLabel == 'dashboard',
);
},
builder: (_, state, __) {
debugPrint("[UpdateCurrentDelay] update===>");
_updateCurrentDelay(
state.currentProxyName,
state.delay,
state.isCurrent,
state.isInit,
);
return child;
},
child: child,
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return CommonCard( return CommonCard(
@@ -131,59 +80,55 @@ class _NetworkDetectionState extends State<NetworkDetection> {
iconData: Icons.network_check, iconData: Icons.network_check,
label: appLocalizations.networkDetection, label: appLocalizations.networkDetection,
), ),
child: _updateCurrentDelayContainer( child: Selector<AppState, NetworkDetectionSelectorState>(
Selector3<AppState, Config, ClashConfig, NetworkDetectionSelectorState>( selector: (_, appState) {
selector: (_, appState, config, clashConfig) { return NetworkDetectionSelectorState(
final proxyName = appState.getCurrentProxyName( currentProxyName: appState.showProxyName,
config.currentProxyName, delay: appState.getDelay(
clashConfig.mode, appState.showProxyName,
); ),
return NetworkDetectionSelectorState( );
isInit: appState.isInit, },
currentProxyName: proxyName, builder: (_, state, __) {
delay: appState.delayMap[proxyName], return Container(
); padding: const EdgeInsets.all(16).copyWith(top: 0),
}, child: Column(
builder: (_, state, __) { mainAxisSize: MainAxisSize.min,
debugPrint("[NetworkDetection] update===>"); crossAxisAlignment: CrossAxisAlignment.start,
return Container( children: [
padding: const EdgeInsets.all(16).copyWith(top: 0), Flexible(
child: Column( flex: 0,
mainAxisSize: MainAxisSize.min, child: TooltipText(
crossAxisAlignment: CrossAxisAlignment.start, text: Text(
children: [ state.currentProxyName ?? appLocalizations.noProxy,
Flexible( overflow: TextOverflow.ellipsis,
flex: 0, maxLines: 1,
child: TooltipText( style: Theme.of(context)
text: Text( .textTheme
state.currentProxyName ?? appLocalizations.noProxy, .titleMedium
overflow: TextOverflow.ellipsis, ?.toSoftBold(),
maxLines: 1, ),
style: ),
Theme.of(context).textTheme.titleMedium?.toSoftBold(), ),
const SizedBox(
height: 8,
),
Flexible(
child: Container(
height: globalState.appController.measure.titleLargeHeight,
alignment: Alignment.centerLeft,
child: FadeBox(
child: _buildDescription(
state.currentProxyName,
state.delay,
), ),
), ),
), ),
const SizedBox( ),
height: 8, ],
), ),
Flexible( );
child: Container( },
height: context.appController.measure.titleLargeHeight,
alignment: Alignment.centerLeft,
child: FadeBox(
child: _buildDescription(
state.currentProxyName,
state.delay,
),
),
),
),
],
),
);
},
),
), ),
); );
} }

View File

@@ -1,5 +1,6 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/widgets.dart'; import 'package:fl_clash/widgets/widgets.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -68,7 +69,7 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
style: bodyMedium, style: bodyMedium,
maxLines: 1, maxLines: 1,
); );
final size = context.appController.measure.computeTextSize(valueText); final size = globalState.appController.measure.computeTextSize(valueText);
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,

View File

@@ -1,6 +1,7 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/enum/enum.dart'; import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/widgets.dart'; import 'package:fl_clash/widgets/widgets.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
@@ -10,11 +11,19 @@ class OutboundMode extends StatelessWidget {
const OutboundMode({super.key}); const OutboundMode({super.key});
_changeMode(BuildContext context, Mode? value) async { _changeMode(BuildContext context, Mode? value) async {
final appController = context.appController; final appController = globalState.appController;
final clashConfig = context.read<ClashConfig>(); final clashConfig = appController.clashConfig;
final config = appController.config;
if (value == null || clashConfig.mode == value) return; if (value == null || clashConfig.mode == value) return;
clashConfig.mode = value; clashConfig.mode = value;
await appController.updateClashConfig(); await appController.updateClashConfig();
if (!config.isCompatible) {
final proxySelected = config.currentSelectedMap[GroupName.Proxy.name];
final globalSelected = config.currentSelectedMap[GroupName.GLOBAL.name];
if (proxySelected != null && globalSelected == null) {
config.updateCurrentSelectedMap(GroupName.GLOBAL.name, proxySelected);
}
}
appController.changeProxy(); appController.changeProxy();
} }
@@ -54,7 +63,8 @@ class OutboundMode extends StatelessWidget {
), ),
title: Text( title: Text(
Intl.message(item.name), Intl.message(item.name),
style: Theme.of(context) style: Theme
.of(context)
.textTheme .textTheme
.titleMedium .titleMedium
?.toSoftBold(), ?.toSoftBold(),

View File

@@ -1,5 +1,6 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -48,11 +49,8 @@ class _StartButtonState extends State<StartButton>
} }
updateSystemProxy() async { updateSystemProxy() async {
final appController = context.appController; final appController = globalState.appController;
await appController.updateSystemProxy(isStart); await appController.updateSystemProxy(isStart);
if (isStart && mounted) {
appController.clearCurrentDelay();
}
} }
@override @override
@@ -63,18 +61,20 @@ class _StartButtonState extends State<StartButton>
hasProfile: config.profiles.isNotEmpty, hasProfile: config.profiles.isNotEmpty,
), ),
builder: (_, state, child) { builder: (_, state, child) {
debugPrint("[StartButton] update===>");
if (!state.isInit || !state.hasProfile) { if (!state.isInit || !state.hasProfile) {
return Container(); return Container();
} }
final textWidth = context.appController.measure.computeTextSize( final textWidth = globalState.appController.measure
Text( .computeTextSize(
Other.getTimeDifference( Text(
DateTime.now(), other.getTimeDifference(
), DateTime.now(),
style: Theme.of(context).textTheme.titleMedium?.toSoftBold(), ),
), style:
).width + Theme.of(context).textTheme.titleMedium?.toSoftBold(),
),
)
.width +
16; 16;
return AnimatedBuilder( return AnimatedBuilder(
animation: _controller.view, animation: _controller.view,
@@ -131,7 +131,7 @@ class _StartButtonState extends State<StartButton>
child: Selector<AppState, int?>( child: Selector<AppState, int?>(
selector: (_, appState) => appState.runTime, selector: (_, appState) => appState.runTime,
builder: (_, int? value, __) { builder: (_, int? value, __) {
final text = Other.getTimeText(value); final text = other.getTimeText(value);
return Text( return Text(
text, text,
style: Theme.of(context).textTheme.titleMedium?.toSoftBold(), style: Theme.of(context).textTheme.titleMedium?.toSoftBold(),

View File

@@ -7,4 +7,5 @@ export 'connections.dart';
export 'access.dart'; export 'access.dart';
export 'config.dart'; export 'config.dart';
export 'application_setting.dart'; export 'application_setting.dart';
export 'about.dart'; export 'about.dart';
export 'backup_and_recovery.dart';

View File

@@ -1,47 +1,16 @@
import 'dart:async'; import 'package:collection/collection.dart';
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../models/models.dart'; import '../models/models.dart';
import '../widgets/widgets.dart'; import '../widgets/widgets.dart';
class LogsFragment extends StatefulWidget { class LogsFragment extends StatelessWidget {
const LogsFragment({super.key}); const LogsFragment({super.key});
@override _initActions(BuildContext context) {
State<LogsFragment> createState() => _LogsFragmentState();
}
class _LogsFragmentState extends State<LogsFragment> {
final logsNotifier = ValueNotifier<List<Log>>([]);
Timer? timer;
@override
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
logsNotifier.value = context.read<AppState>().logs;
if (timer != null) {
timer?.cancel();
timer = null;
}
timer = Timer.periodic(const Duration(seconds: 3), (timer) {
if (mounted) {
logsNotifier.value = context.read<AppState>().logs;
}
});
});
}
@override
void dispose() {
super.dispose();
timer?.cancel();
timer = null;
}
_initActions() {
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
final commonScaffoldState = final commonScaffoldState =
context.findAncestorStateOfType<CommonScaffoldState>(); context.findAncestorStateOfType<CommonScaffoldState>();
@@ -51,7 +20,7 @@ class _LogsFragmentState extends State<LogsFragment> {
showSearch( showSearch(
context: context, context: context,
delegate: LogsSearchDelegate( delegate: LogsSearchDelegate(
logs: logsNotifier.value.reversed.toList(), logs: globalState.appController.appState.logs.reversed.toList(),
), ),
); );
}, },
@@ -62,8 +31,10 @@ class _LogsFragmentState extends State<LogsFragment> {
} }
_buildList() { _buildList() {
return ValueListenableBuilder<List<Log>>( return Selector<AppState, List<Log>>(
valueListenable: logsNotifier, selector: (_, appState) => appState.logs,
shouldRebuild: (prev, next) =>
!const ListEquality<Log>().equals(prev, next),
builder: (_, List<Log> logs, __) { builder: (_, List<Log> logs, __) {
if (logs.isEmpty) { if (logs.isEmpty) {
return NullStatus( return NullStatus(
@@ -77,6 +48,7 @@ class _LogsFragmentState extends State<LogsFragment> {
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
final log = logs[index]; final log = logs[index];
return LogItem( return LogItem(
key: ValueKey(log.dateTime),
log: log, log: log,
); );
}, },
@@ -93,12 +65,14 @@ class _LogsFragmentState extends State<LogsFragment> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Selector<AppState, bool?>( return Selector<AppState, bool?>(
selector: (_, appState) => selector: (_, appState) {
appState.currentLabel == 'logs' || return appState.currentLabel == 'logs' ||
context.isMobile && appState.currentLabel == "tools", appState.viewMode == ViewMode.mobile &&
appState.currentLabel == "tools";
},
builder: (_, isCurrent, child) { builder: (_, isCurrent, child) {
if (isCurrent == null || isCurrent) { if (isCurrent == null || isCurrent) {
_initActions(); _initActions(context);
} }
return child!; return child!;
}, },
@@ -114,13 +88,16 @@ class LogsSearchDelegate extends SearchDelegate {
required this.logs, required this.logs,
}); });
List<Log> get _results => logs List<Log> get _results {
.where( final lowQuery = query.toLowerCase();
(log) => return logs
(log.payload?.contains(query) ?? false) || .where(
log.logLevel.name.contains(query), (log) =>
) (log.payload?.toLowerCase().contains(lowQuery) ?? false) ||
.toList(); log.logLevel.name.contains(lowQuery),
)
.toList();
}
@override @override
List<Widget>? buildActions(BuildContext context) { List<Widget>? buildActions(BuildContext context) {
@@ -161,6 +138,7 @@ class LogsSearchDelegate extends SearchDelegate {
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
final log = _results[index]; final log = _results[index];
return LogItem( return LogItem(
key: ValueKey(log.dateTime),
log: log, log: log,
); );
}, },

View File

@@ -1,4 +1,3 @@
import 'dart:io';
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/pages/scan.dart'; import 'package:fl_clash/pages/scan.dart';
import 'package:fl_clash/state.dart'; import 'package:fl_clash/state.dart';
@@ -8,17 +7,21 @@ import 'package:flutter/material.dart';
class AddProfile extends StatelessWidget { class AddProfile extends StatelessWidget {
final BuildContext context; final BuildContext context;
const AddProfile({super.key, required this.context}); const AddProfile({super.key, required this.context,});
_handleAddProfileFormFile() async { _handleAddProfileFormFile() async {
context.appController.addProfileFormFile(); globalState.appController.addProfileFormFile();
} }
_handleAddProfileFormURL(String url) async { _handleAddProfileFormURL(String url) async {
context.appController.addProfileFormURL(url); globalState.appController.addProfileFormURL(url);
} }
_toScan() async { _toScan() async {
if(system.isDesktop){
globalState.appController.addProfileFormQrCode();
return;
}
final url = await Navigator.of(context) final url = await Navigator.of(context)
.push<String>(MaterialPageRoute(builder: (_) => const ScanPage())); .push<String>(MaterialPageRoute(builder: (_) => const ScanPage()));
if (url != null) { if (url != null) {
@@ -39,7 +42,6 @@ class AddProfile extends StatelessWidget {
Widget build(context) { Widget build(context) {
return ListView( return ListView(
children: [ children: [
if (Platform.isAndroid)
ListItem( ListItem(
leading: const Icon(Icons.qr_code), leading: const Icon(Icons.qr_code),
title: Text(appLocalizations.qrcode), title: Text(appLocalizations.qrcode),

View File

@@ -1,5 +1,6 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/widgets.dart'; import 'package:fl_clash/widgets/widgets.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -38,7 +39,7 @@ class _EditProfileState extends State<EditProfile> {
_handleConfirm() { _handleConfirm() {
if (!_formKey.currentState!.validate()) return; if (!_formKey.currentState!.validate()) return;
final config = context.read<Config>(); final config = widget.context.read<Config>();
final hasUpdate = widget.profile.url != urlController.text; final hasUpdate = widget.profile.url != urlController.text;
widget.profile.url = urlController.text; widget.profile.url = urlController.text;
widget.profile.label = labelController.text; widget.profile.label = labelController.text;
@@ -48,7 +49,7 @@ class _EditProfileState extends State<EditProfile> {
config.setProfile(widget.profile); config.setProfile(widget.profile);
if (hasUpdate) { if (hasUpdate) {
widget.context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun( widget.context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
() => context.appController.updateProfile( () => globalState.appController.updateProfile(
widget.profile.id, widget.profile.id,
), ),
); );
@@ -85,6 +86,7 @@ class _EditProfileState extends State<EditProfile> {
ListItem( ListItem(
title: TextFormField( title: TextFormField(
controller: urlController, controller: urlController,
minLines: 1,
maxLines: 2, maxLines: 2,
decoration: InputDecoration( decoration: InputDecoration(
border: const OutlineInputBorder(), border: const OutlineInputBorder(),

View File

@@ -1,9 +1,10 @@
import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/fragments/profiles/edit_profile.dart'; import 'package:fl_clash/fragments/profiles/edit_profile.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/widgets.dart'; import 'package:fl_clash/widgets/widgets.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'add_profile.dart'; import 'add_profile.dart';
@@ -24,6 +25,157 @@ class ProfilesFragment extends StatefulWidget {
} }
class _ProfilesFragmentState extends State<ProfilesFragment> { class _ProfilesFragmentState extends State<ProfilesFragment> {
_handleDeleteProfile(String id) async {
globalState.appController.deleteProfile(id);
}
_handleUpdateProfile(String id) async {
context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
() => globalState.appController.updateProfile(id),
);
}
_handleShowAddExtendPage() {
showExtendPage(
globalState.navigatorKey.currentState!.context,
body: AddProfile(
context: globalState.navigatorKey.currentState!.context,
),
title: "${appLocalizations.add}${appLocalizations.profile}",
);
}
_handleShowEditExtendPage(Profile profile) {
showExtendPage(
context,
body: EditProfile(
profile: profile.copyWith(),
context: context,
),
title: "${appLocalizations.edit}${appLocalizations.profile}",
);
}
_buildGrid({
required ProfilesSelectorState state,
int crossAxisCount = 1,
}) {
return SingleChildScrollView(
padding: crossAxisCount > 1
? const EdgeInsets.symmetric(horizontal: 16)
: EdgeInsets.zero,
child: Grid.baseGap(
crossAxisCount: crossAxisCount,
children: [
for (final profile in state.profiles)
GridItem(
child: ProfileItem(
profile: profile,
commonPopupMenu: CommonPopupMenu<ProfileActions>(
items: [
CommonPopupMenuItem(
action: ProfileActions.edit,
label: appLocalizations.edit,
iconData: Icons.edit,
),
if (profile.url != null)
CommonPopupMenuItem(
action: ProfileActions.update,
label: appLocalizations.update,
iconData: Icons.sync,
),
CommonPopupMenuItem(
action: ProfileActions.delete,
label: appLocalizations.delete,
iconData: Icons.delete,
),
],
onSelected: (ProfileActions? action) async {
switch (action) {
case ProfileActions.edit:
_handleShowEditExtendPage(profile);
break;
case ProfileActions.delete:
_handleDeleteProfile(profile.id);
break;
case ProfileActions.update:
_handleUpdateProfile(profile.id);
break;
case null:
break;
}
},
),
groupValue: state.currentProfileId,
onChanged: globalState.appController.changeProfile,
),
),
],
),
);
}
_getColumns(ViewMode viewMode) {
switch (viewMode) {
case ViewMode.mobile:
return 1;
case ViewMode.laptop:
return 1;
case ViewMode.desktop:
return 2;
}
}
@override
Widget build(BuildContext context) {
return FloatLayout(
floatingWidget: Container(
margin: const EdgeInsets.all(kFloatingActionButtonMargin),
child: FloatingActionButton(
heroTag: null,
onPressed: _handleShowAddExtendPage,
child: const Icon(Icons.add),
),
),
child: Selector2<AppState, Config, ProfilesSelectorState>(
selector: (_, appState, config) => ProfilesSelectorState(
profiles: config.profiles,
currentProfileId: config.currentProfileId,
viewMode: appState.viewMode),
builder: (context, state, child) {
if (state.profiles.isEmpty) {
return NullStatus(
label: appLocalizations.nullProfileDesc,
);
}
return Align(
alignment: Alignment.topCenter,
child: _buildGrid(
state: state,
crossAxisCount: _getColumns(state.viewMode),
),
);
},
),
);
}
}
class ProfileItem extends StatelessWidget {
final Profile profile;
final String? groupValue;
final CommonPopupMenu commonPopupMenu;
final void Function(String? value) onChanged;
const ProfileItem({
super.key,
required this.profile,
required this.commonPopupMenu,
required this.groupValue,
required this.onChanged,
});
String _getLastUpdateTimeDifference(DateTime lastDateTime) { String _getLastUpdateTimeDifference(DateTime lastDateTime) {
final currentDateTime = DateTime.now(); final currentDateTime = DateTime.now();
final difference = currentDateTime.difference(lastDateTime); final difference = currentDateTime.difference(lastDateTime);
@@ -48,21 +200,8 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
return appLocalizations.just; return appLocalizations.just;
} }
_handleDeleteProfile(String id) async { @override
context.appController.deleteProfile(id); Widget build(BuildContext context) {
}
_handleUpdateProfile(String id) async {
context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
() => context.appController.updateProfile(id),
);
}
Widget _profileItem({
required Profile profile,
required String? groupValue,
required void Function(String? value) onChanged,
}) {
String useShow; String useShow;
String totalShow; String totalShow;
double progress; double progress;
@@ -86,41 +225,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
onChanged: onChanged, onChanged: onChanged,
), ),
padding: const EdgeInsets.symmetric(horizontal: 16), padding: const EdgeInsets.symmetric(horizontal: 16),
trailing: CommonPopupMenu<ProfileActions>( trailing: commonPopupMenu,
items: [
CommonPopupMenuItem(
action: ProfileActions.edit,
label: appLocalizations.edit,
iconData: Icons.edit,
),
if (profile.url != null)
CommonPopupMenuItem(
action: ProfileActions.update,
label: appLocalizations.update,
iconData: Icons.sync,
),
CommonPopupMenuItem(
action: ProfileActions.delete,
label: appLocalizations.delete,
iconData: Icons.delete,
),
],
onSelected: (ProfileActions? action) async {
switch (action) {
case ProfileActions.edit:
_handleShowEditExtendPage(profile);
break;
case ProfileActions.delete:
_handleDeleteProfile(profile.id);
break;
case ProfileActions.update:
_handleUpdateProfile(profile.id);
break;
case null:
break;
}
},
),
title: Column( title: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@@ -171,105 +276,4 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
), ),
); );
} }
_handleShowAddExtendPage() {
showExtendPage(
context,
body: AddProfile(
context: context,
),
title: "${appLocalizations.add}${appLocalizations.profile}",
);
}
_handleShowEditExtendPage(Profile profile) {
showExtendPage(
context,
body: EditProfile(
profile: profile.copyWith(),
context: context,
),
title: "${appLocalizations.edit}${appLocalizations.profile}",
);
}
_buildGrid({
required ProfilesSelectorState state,
int crossAxisCount = 1,
}) {
return SingleChildScrollView(
padding: crossAxisCount > 1
? const EdgeInsets.symmetric(horizontal: 16)
: EdgeInsets.zero,
child: Grid.baseGap(
crossAxisCount: crossAxisCount,
children: [
for (final profile in state.profiles)
GridItem(
child: _profileItem(
profile: profile,
groupValue: state.currentProfileId,
onChanged: context.appController.changeProfile,
),
),
],
),
);
}
@override
Widget build(BuildContext context) {
return FloatLayout(
floatingWidget: Container(
margin: const EdgeInsets.all(kFloatingActionButtonMargin),
child: FloatingActionButton(
heroTag: null,
onPressed: _handleShowAddExtendPage,
child: const Icon(Icons.add),
),
),
child: Selector<Config, ProfilesSelectorState>(
selector: (_, config) => ProfilesSelectorState(
profiles: config.profiles,
currentProfileId: config.currentProfileId,
),
builder: (context, state, child) {
debugPrint("[Profiles] update===>");
if (state.profiles.isEmpty) {
return NullStatus(
label: appLocalizations.nullProfileDesc,
);
}
return Align(
alignment: Alignment.topCenter,
child: SlotLayout(
config: {
Breakpoints.small: SlotLayout.from(
key: const Key('profiles_grid_small'),
builder: (_) => _buildGrid(
state: state,
crossAxisCount: 1,
),
),
Breakpoints.medium: SlotLayout.from(
key: const Key('profiles_grid_medium'),
builder: (_) => _buildGrid(
state: state,
crossAxisCount: 1,
),
),
Breakpoints.large: SlotLayout.from(
key: const Key('profiles_grid_large'),
builder: (_) => _buildGrid(
state: state,
crossAxisCount: 2,
),
),
},
),
);
},
),
);
}
} }

View File

@@ -1,7 +1,5 @@
import 'package:collection/collection.dart'; import 'package:fl_clash/state.dart';
import 'package:fl_clash/clash/clash.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../enum/enum.dart'; import '../enum/enum.dart';
@@ -57,122 +55,380 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
}); });
} }
_updateTabController(length) {
if (_tabController != null) {
_tabController!.dispose();
_tabController = null;
}
_tabController = TabController(
length: length,
vsync: this,
);
}
@override
void dispose() {
if (_tabController != null) {
_tabController!.dispose();
_tabController = null;
}
super.dispose();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Selector<AppState, bool>( return DelayTestButtonContainer(
selector: (_, appState) => appState.currentLabel == 'proxies', child: Selector<AppState, bool>(
builder: (_, isCurrent, child) { selector: (_, appState) => appState.currentLabel == 'proxies',
if (isCurrent) { builder: (_, isCurrent, child) {
_initActions(); if (isCurrent) {
} _initActions();
return child!; }
}, return child!;
child: Selector2<AppState, ClashConfig, List<Group>>( },
selector: (_, appState, clashConfig) => child: Selector3<AppState, Config, ClashConfig, ProxiesSelectorState>(
appState.getCurrentGroups(clashConfig.mode), selector: (_, appState, config, clashConfig) {
shouldRebuild: (prev, next) => final currentGroups = appState.currentGroups;
!const ListEquality<Group>().equals(prev, next), final groupNames = currentGroups.map((e) => e.name).toList();
builder: (_, groups, __) { return ProxiesSelectorState(
debugPrint("[Proxies] update===>"); groupNames: groupNames,
_updateTabController(groups.length); );
return Column( },
mainAxisAlignment: MainAxisAlignment.start, shouldRebuild: (prev, next) {
crossAxisAlignment: CrossAxisAlignment.start, if (prev.groupNames.length != next.groupNames.length) {
children: [ _tabController?.dispose();
TabBar( _tabController = null;
controller: _tabController, }
padding: const EdgeInsets.symmetric(horizontal: 16), return prev != next;
dividerColor: Colors.transparent, },
isScrollable: true, builder: (_, state, __) {
tabAlignment: TabAlignment.start, _tabController ??= TabController(
overlayColor: length: state.groupNames.length,
const MaterialStatePropertyAll(Colors.transparent), vsync: this,
tabs: [ );
for (final group in groups) return Column(
Tab( mainAxisAlignment: MainAxisAlignment.start,
text: group.name, crossAxisAlignment: CrossAxisAlignment.start,
), children: [
], TabBar(
),
Expanded(
child: TabBarView(
controller: _tabController, controller: _tabController,
children: [ padding: const EdgeInsets.symmetric(horizontal: 16),
for (final group in groups) dividerColor: Colors.transparent,
KeepContainer( isScrollable: true,
child: ProxiesTabView( tabAlignment: TabAlignment.start,
group: group, overlayColor:
), const WidgetStatePropertyAll(Colors.transparent),
tabs: [
for (final groupName in state.groupNames)
Tab(
text: groupName,
), ),
], ],
), ),
) Expanded(
], child: TabBarView(
); controller: _tabController,
}, children: [
for (final groupName in state.groupNames)
KeepContainer(
key: ObjectKey(groupName),
child: ProxiesTabView(
groupName: groupName,
),
),
],
),
)
],
);
},
),
), ),
); );
} }
} }
class ProxiesTabView extends StatefulWidget { class ProxiesTabView extends StatelessWidget {
final Group group; final String groupName;
const ProxiesTabView({ const ProxiesTabView({
super.key, super.key,
required this.group, required this.groupName,
});
List<Proxy> _sortOfName(List<Proxy> proxies) {
return List.of(proxies)
..sort(
(a, b) => other.sortByChar(a.name, b.name),
);
}
List<Proxy> _sortOfDelay(BuildContext context, List<Proxy> proxies) {
final appState = context.read<AppState>();
return proxies = List.of(proxies)
..sort(
(a, b) {
final aDelay = appState.getDelay(a.name);
final bDelay = appState.getDelay(b.name);
if (aDelay == null && bDelay == null) {
return 0;
}
if (aDelay == null || aDelay == -1) {
return 1;
}
if (bDelay == null || bDelay == -1) {
return -1;
}
return aDelay.compareTo(bDelay);
},
);
}
_getProxies(
BuildContext context,
List<Proxy> proxies,
ProxiesSortType proxiesSortType,
) {
if (proxiesSortType == ProxiesSortType.delay) {
return _sortOfDelay(context, proxies);
}
if (proxiesSortType == ProxiesSortType.name) return _sortOfName(proxies);
return proxies;
}
double _getItemHeight(BuildContext context) {
final measure = globalState.appController.measure;
return 12 * 2 +
measure.bodyMediumHeight * 2 +
measure.bodySmallHeight +
measure.labelSmallHeight +
8 * 2;
}
int _getColumns(ViewMode viewMode) {
switch (viewMode) {
case ViewMode.mobile:
return 2;
case ViewMode.laptop:
return 3;
case ViewMode.desktop:
return 4;
}
}
@override
Widget build(BuildContext context) {
return Selector2<AppState, Config, ProxiesTabViewSelectorState>(
selector: (_, appState, config) {
return ProxiesTabViewSelectorState(
proxiesSortType: config.proxiesSortType,
sortNum: appState.sortNum,
group: appState.getGroupWithName(groupName)!,
viewMode: appState.viewMode,
);
},
builder: (_, state, __) {
final proxies = _getProxies(
context,
state.group.all,
state.proxiesSortType,
);
return Align(
alignment: Alignment.topCenter,
child: GridView.builder(
padding: const EdgeInsets.all(16),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: _getColumns(state.viewMode),
mainAxisSpacing: 8,
crossAxisSpacing: 8,
mainAxisExtent: _getItemHeight(context),
),
itemCount: proxies.length,
itemBuilder: (_, index) {
final proxy = proxies[index];
return ProxyCard(
key: ValueKey('$groupName.${proxy.name}'),
proxy: proxy,
groupName: groupName,
);
},
),
);
},
);
}
}
class ProxyCard extends StatelessWidget {
final String groupName;
final Proxy proxy;
const ProxyCard({
super.key,
required this.groupName,
required this.proxy,
}); });
@override @override
State<ProxiesTabView> createState() => _ProxiesTabViewState(); Widget build(BuildContext context) {
final measure = globalState.appController.measure;
return Selector3<AppState, Config, ClashConfig, ProxiesCardSelectorState>(
selector: (_, appState, config, clashConfig) {
final group = appState.getGroupWithName(groupName)!;
bool isSelected = config.currentSelectedMap[group.name] == proxy.name ||
(config.currentSelectedMap[group.name] == null &&
group.now == proxy.name);
return ProxiesCardSelectorState(
isSelected: isSelected,
);
},
builder: (_, state, __) {
return CommonCard(
isSelected: state.isSelected,
onPressed: () {
final appController = globalState.appController;
final group = appController.appState.getGroupWithName(groupName)!;
if (group.type != GroupType.Selector) {
globalState.showSnackBar(
context,
message: appLocalizations.notSelectedTip,
);
return;
}
globalState.appController.config.updateCurrentSelectedMap(
groupName,
proxy.name,
);
globalState.appController.changeProxy();
},
selectWidget: Container(
alignment: Alignment.topRight,
margin: const EdgeInsets.all(8),
child: Container(
padding: const EdgeInsets.all(4),
decoration: BoxDecoration(
shape: BoxShape.circle,
color: Theme.of(context).colorScheme.secondaryContainer,
),
child: const SelectIcon(),
),
),
child: Padding(
padding: const EdgeInsets.all(12),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
height: measure.bodyMediumHeight * 2,
child: Text(
proxy.name,
maxLines: 2,
style: context.textTheme.bodyMedium?.copyWith(
overflow: TextOverflow.ellipsis,
),
),
),
const SizedBox(
height: 8,
),
SizedBox(
height: measure.bodySmallHeight,
child: Selector<AppState, String>(
selector: (context, appState) => appState.getDesc(
proxy.type,
proxy.name,
),
builder: (_, desc, __) {
return TooltipText(
text: Text(
desc,
style: context.textTheme.bodySmall?.copyWith(
overflow: TextOverflow.ellipsis,
color:
context.textTheme.bodySmall?.color?.toLight(),
),
),
);
},
),
),
const SizedBox(
height: 8,
),
SizedBox(
height: measure.labelSmallHeight,
child: Selector<AppState, int?>(
selector: (context, appState) => appState.getDelay(
proxy.name,
),
builder: (_, delay, __) {
return FadeBox(
child: Builder(
builder: (_) {
if (delay == null) {
return Container();
}
if (delay == 0) {
return SizedBox(
height: measure.labelSmallHeight,
width: measure.labelSmallHeight,
child: const CircularProgressIndicator(
strokeWidth: 2,
),
);
}
return Text(
delay > 0 ? '$delay ms' : "Timeout",
style: context.textTheme.labelSmall?.copyWith(
overflow: TextOverflow.ellipsis,
color: other.getDelayColor(
delay,
),
),
);
},
),
);
},
),
),
],
),
),
);
},
);
}
} }
class _ProxiesTabViewState extends State<ProxiesTabView> class DelayTestButtonContainer extends StatefulWidget {
final Widget child;
const DelayTestButtonContainer({
super.key,
required this.child,
});
@override
State<DelayTestButtonContainer> createState() =>
_DelayTestButtonContainerState();
}
class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
with SingleTickerProviderStateMixin { with SingleTickerProviderStateMixin {
var lock = false;
late AnimationController _controller; late AnimationController _controller;
late Animation<double> _scale; late Animation<double> _scale;
late Animation<double> _opacity; late Animation<double> _opacity;
_healthcheck() async {
if (globalState.healthcheckLock) return;
_controller.forward();
globalState.appController.healthcheck();
Future.delayed(httpTimeoutDuration + moreDuration, () {
_controller.reverse();
});
}
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_controller = AnimationController( _controller = AnimationController(
vsync: this, vsync: this,
duration: const Duration( duration: const Duration(
milliseconds: 200, milliseconds: 300,
), ),
); );
_scale = Tween<double>( _scale = Tween<double>(
begin: 1.0, begin: 1.0,
end: 0.8, end: 0.0,
).animate( ).animate(
CurvedAnimation( CurvedAnimation(
parent: _controller, parent: _controller,
curve: const Interval( curve: const Interval(
0.0, 0,
0.3, 1,
curve: Curves.easeIn, curve: Curves.elasticInOut,
), ),
), ),
); );
@@ -193,277 +449,37 @@ class _ProxiesTabViewState extends State<ProxiesTabView>
@override @override
void dispose() { void dispose() {
super.dispose();
_controller.dispose(); _controller.dispose();
} super.dispose();
get group => widget.group;
get measure => context.appController.measure;
List<Proxy> _sortOfName(List<Proxy> proxies) {
return List.of(proxies)
..sort(
(a, b) => Other.sortByChar(a.name, b.name),
);
}
List<Proxy> _sortOfDelay(List<Proxy> proxies) {
final appState = context.read<AppState>();
final delayMap = appState.delayMap;
return proxies = List.of(proxies)
..sort(
(a, b) {
final aDelay = delayMap[a.name];
final bDelay = delayMap[b.name];
if (aDelay == null && bDelay == null) {
return 0;
}
if (aDelay == null || aDelay == -1) {
return 1;
}
if (bDelay == null || bDelay == -1) {
return -1;
}
return aDelay.compareTo(bDelay);
},
);
}
_getProxies(
List<Proxy> proxies,
ProxiesSortType proxiesSortType,
) {
if (proxiesSortType == ProxiesSortType.delay) return _sortOfDelay(proxies);
if (proxiesSortType == ProxiesSortType.name) return _sortOfName(proxies);
return proxies;
}
_getDelayMap() async {
if (lock == true) return;
lock = true;
_controller.forward();
for (final proxy in group.all) {
context.appController.setDelay(
Delay(
name: proxy.name,
value: 0,
),
);
clashCore.delay(
proxy.name,
);
}
await Future.delayed(
appConstant.httpTimeoutDuration + appConstant.moreDuration,
);
lock = false;
_controller.reverse();
setState(() {});
}
double _getItemHeight() {
return 12 * 2 +
measure.bodyMediumHeight * 2 +
measure.bodySmallHeight +
measure.labelSmallHeight +
8 * 2;
}
_card({
required void Function() onPressed,
required bool isSelected,
required Proxy proxy,
}) {
return CommonCard(
isSelected: isSelected,
onPressed: onPressed,
selectWidget: Container(
alignment: Alignment.topRight,
margin: const EdgeInsets.all(8),
child: Container(
padding: const EdgeInsets.all(4),
decoration: BoxDecoration(
shape: BoxShape.circle,
color: Theme.of(context).colorScheme.secondaryContainer,
),
child: const SelectIcon(),
),
),
child: Padding(
padding: const EdgeInsets.all(12),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
height: measure.bodyMediumHeight * 2,
child: Text(
proxy.name,
maxLines: 2,
style: context.textTheme.bodyMedium?.copyWith(
overflow: TextOverflow.ellipsis,
),
),
),
const SizedBox(
height: 8,
),
SizedBox(
height: measure.bodySmallHeight,
child: Text(
proxy.type,
style: context.textTheme.bodySmall?.copyWith(
overflow: TextOverflow.ellipsis,
color: context.textTheme.bodySmall?.color?.toLight(),
),
),
),
const SizedBox(
height: 8,
),
SizedBox(
height: measure.labelSmallHeight,
child: Selector<AppState, int?>(
selector: (context, appState) => appState.delayMap[proxy.name],
builder: (_, delay, __) {
return FadeBox(
child: Builder(
builder: (_) {
if (delay == null) {
return Container();
}
if (delay == 0) {
return SizedBox(
height: measure.labelSmallHeight,
width: measure.labelSmallHeight,
child: const CircularProgressIndicator(
strokeWidth: 2,
),
);
}
return Text(
delay > 0 ? '$delay ms' : "Timeout",
style: context.textTheme.labelSmall?.copyWith(
overflow: TextOverflow.ellipsis,
color: Other.getDelayColor(
delay,
),
),
);
},
),
);
},
),
),
],
),
),
);
}
_buildGrid({
required ProxiesSortType proxiesSortType,
required int columns,
}) {
return SingleChildScrollView(
padding: const EdgeInsets.all(16),
child: AnimateGrid<Proxy>(
items: _getProxies(group.all, proxiesSortType),
columns: columns,
itemHeight: _getItemHeight(),
keyBuilder: (item) {
return ObjectKey(item);
},
builder: (_, proxy) {
return Selector3<AppState, Config, ClashConfig, String?>(
selector: (_, appState, config, clashConfig) =>
appState.getCurrentProxyName(
config.currentProxyName,
clashConfig.mode,
),
builder: (_, value, __) {
final currentProxyName =
group.type == GroupType.Selector ? value : group.now;
return _card(
isSelected: proxy.name == currentProxyName,
onPressed: () {
if (group.type == GroupType.Selector) {
final config = context.read<Config>();
config.currentProfile?.groupName = group.name;
config.currentProfile?.proxyName = proxy.name;
config.update();
context.appController.changeProxy();
}
},
proxy: proxy,
);
},
);
},
),
);
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Selector<Config, ProxiesSortType>( return FloatLayout(
selector: (_, config) => config.proxiesSortType, floatingWidget: FloatWrapper(
builder: (_, proxiesSortType, __) { child: AnimatedBuilder(
return FloatLayout( animation: _controller,
floatingWidget: FloatWrapper( builder: (_, child) {
child: AnimatedBuilder( return SizedBox(
animation: _controller, width: 56,
builder: (_, __) { height: 56,
return Transform.scale( child: Transform.scale(
scale: _scale.value, scale: _scale.value,
child: SizedBox( child: Opacity(
width: 56, opacity: _opacity.value,
height: 56, child: child!,
child: Opacity( ),
opacity: _opacity.value, ),
child: FloatingActionButton( );
heroTag: null, },
onPressed: _getDelayMap, child: FloatingActionButton(
child: const Icon(Icons.network_ping), heroTag: null,
), onPressed: _healthcheck,
), child: const Icon(Icons.network_ping),
),
);
},
),
), ),
child: Align( ),
alignment: Alignment.topCenter, ),
child: SlotLayout( child: widget.child,
config: {
Breakpoints.small: SlotLayout.from(
key: const Key('proxies_grid_small'),
builder: (_) => _buildGrid(
proxiesSortType: proxiesSortType,
columns: 2,
),
),
Breakpoints.medium: SlotLayout.from(
key: const Key('proxies_grid_medium'),
builder: (_) => _buildGrid(
proxiesSortType: proxiesSortType,
columns: 3,
),
),
Breakpoints.large: SlotLayout.from(
key: const Key('proxies_grid_large'),
builder: (_) => _buildGrid(
proxiesSortType: proxiesSortType,
columns: 4,
),
),
},
),
),
);
},
); );
} }
} }

View File

@@ -1,5 +1,6 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -28,7 +29,7 @@ class ThemeFragment extends StatelessWidget {
return CommonCard( return CommonCard(
isSelected: isSelected, isSelected: isSelected,
onPressed: () { onPressed: () {
context.appController.config.themeMode = themeModeItem.themeMode; globalState.appController.config.themeMode = themeModeItem.themeMode;
}, },
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal:16), padding: const EdgeInsets.symmetric(horizontal:16),
@@ -62,7 +63,7 @@ class ThemeFragment extends StatelessWidget {
isSelected: isSelected, isSelected: isSelected,
primaryColor: color, primaryColor: color,
onPressed: () { onPressed: () {
context.appController.config.primaryColor = color?.value; globalState.appController.config.primaryColor = color?.value;
}, },
); );
} }
@@ -108,7 +109,7 @@ class ThemeFragment extends StatelessWidget {
]; ];
List<Color?> primaryColors = [ List<Color?> primaryColors = [
null, null,
appConstant.defaultPrimaryColor, defaultPrimaryColor,
Colors.pinkAccent, Colors.pinkAccent,
Colors.greenAccent, Colors.greenAccent,
Colors.yellowAccent, Colors.yellowAccent,

View File

@@ -12,6 +12,7 @@ import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../widgets/widgets.dart'; import '../widgets/widgets.dart';
import 'backup_and_recovery.dart';
import 'theme.dart'; import 'theme.dart';
class ToolsFragment extends StatefulWidget { class ToolsFragment extends StatefulWidget {
@@ -51,33 +52,6 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
); );
} }
Widget _buildSection({
required String title,
required Widget content,
}) {
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Flexible(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
child: Text(
title,
style: Theme.of(context).textTheme.labelLarge?.copyWith(
color: Theme.of(context).colorScheme.primary,
),
),
),
),
Expanded(
flex: 0,
child: content,
)
],
);
}
String _getLocaleString(Locale? locale) { String _getLocaleString(Locale? locale) {
if (locale == null) return appLocalizations.defaultText; if (locale == null) return appLocalizations.defaultText;
return Intl.message(locale.toString()); return Intl.message(locale.toString());
@@ -114,7 +88,7 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
selector: (_, config) => config.locale, selector: (_, config) => config.locale,
builder: (_, localeString, __) { builder: (_, localeString, __) {
final subTitle = localeString ?? appLocalizations.defaultText; final subTitle = localeString ?? appLocalizations.defaultText;
final currentLocale = Other.getLocaleForString(localeString); final currentLocale = other.getLocaleForString(localeString);
return ListTile( return ListTile(
leading: const Icon(Icons.language_outlined), leading: const Icon(Icons.language_outlined),
title: Text(appLocalizations.language), title: Text(appLocalizations.language),
@@ -161,9 +135,19 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
title: Text(appLocalizations.theme), title: Text(appLocalizations.theme),
subtitle: Text(appLocalizations.themeDesc), subtitle: Text(appLocalizations.themeDesc),
delegate: OpenDelegate( delegate: OpenDelegate(
title: appLocalizations.theme, title: appLocalizations.theme,
widget: const ThemeFragment(), widget: const ThemeFragment(),
extendPageWidth: 360), extendPageWidth: 360,
),
),
ListItem.open(
leading: const Icon(Icons.cloud_sync),
title: Text(appLocalizations.backupAndRecovery),
subtitle: Text(appLocalizations.backupAndRecoveryDesc),
delegate: OpenDelegate(
title: appLocalizations.backupAndRecovery,
widget: const BackupAndRecovery(),
),
), ),
if (Platform.isAndroid) if (Platform.isAndroid)
ListItem.open( ListItem.open(
@@ -210,44 +194,47 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final items = [ return Selector<Config, String?>(
LayoutBuilder(builder: (context, container) { selector: (_, config) => config.locale,
final isMobile = context.isMobile; builder: (_, __, ___) {
if (!isMobile) { final items = [
return Container( Selector<AppState, MoreToolsSelectorState>(
margin: const EdgeInsets.only(top: 18), selector: (_, appState) {
); return MoreToolsSelectorState(
} navigationItems: appState.viewMode == ViewMode.mobile
return Selector<AppState, List<NavigationItem>>( ? appState.navigationItems.where(
selector: (_, appState) => appState.navigationItems, (element) {
builder: (_, navigationItems, __) { return element.modes
final moreNavigationItems = navigationItems .contains(NavigationItemMode.more);
.where( },
(element) => element.modes.contains(NavigationItemMode.more), ).toList()
) : [],
.toList(); );
if (moreNavigationItems.isEmpty) { },
return Container(); builder: (_, state, __) {
} if (state.navigationItems.isEmpty) {
return _buildSection( return Container();
title: appLocalizations.more, }
content: _buildNavigationMenu(moreNavigationItems), return Section(
); title: appLocalizations.more,
}, child: _buildNavigationMenu(state.navigationItems),
);
},
),
Section(
title: appLocalizations.settings,
child: _getSettingList(),
),
Section(
title: appLocalizations.other,
child: _getOtherList(),
),
];
return ListView.builder(
itemCount: items.length,
itemBuilder: (_, index) => items[index],
); );
}), },
_buildSection(
title: appLocalizations.settings,
content: _getSettingList(),
),
_buildSection(
title: appLocalizations.other,
content: _getOtherList(),
),
];
return ListView.builder(
itemCount: items.length,
itemBuilder: (_, index) => items[index],
); );
} }
} }

View File

@@ -35,7 +35,7 @@
"overrideDesc": "Override Proxy related config", "overrideDesc": "Override Proxy related config",
"allowLan": "AllowLan", "allowLan": "AllowLan",
"allowLanDesc": "Allow access proxy through the LAN", "allowLanDesc": "Allow access proxy through the LAN",
"tun": "Tun", "tun": "Tun mode",
"tunDesc": "only effective in administrator mode", "tunDesc": "only effective in administrator mode",
"minimizeOnExit": "Minimize on exit", "minimizeOnExit": "Minimize on exit",
"minimizeOnExitDesc": "Modify the default system exit event", "minimizeOnExitDesc": "Modify the default system exit event",
@@ -47,6 +47,8 @@
"autoRunDesc": "Auto run when the application is opened", "autoRunDesc": "Auto run when the application is opened",
"logcat": "Logcat", "logcat": "Logcat",
"logcatDesc": "Disabling will hide the log entry", "logcatDesc": "Disabling will hide the log entry",
"autoCheckUpdate": "Auto check updates",
"autoCheckUpdateDesc": "Auto check for updates when the app starts",
"accessControl": "AccessControl", "accessControl": "AccessControl",
"accessControlDesc": "Configure application access proxy", "accessControlDesc": "Configure application access proxy",
"application": "Application", "application": "Application",
@@ -92,6 +94,7 @@
"delaySort": "Sort by delay", "delaySort": "Sort by delay",
"nameSort": "Sort by name", "nameSort": "Sort by name",
"pleaseUploadFile": "Please upload file", "pleaseUploadFile": "Please upload file",
"pleaseUploadValidQrcode": "Please upload a valid QR code",
"blacklistMode": "Blacklist mode", "blacklistMode": "Blacklist mode",
"whitelistMode": "Whitelist mode", "whitelistMode": "Whitelist mode",
"filterSystemApp": "Filter system app", "filterSystemApp": "Filter system app",
@@ -113,11 +116,40 @@
"systemProxy": "SystemProxy", "systemProxy": "SystemProxy",
"project": "Project", "project": "Project",
"core": "Core", "core": "Core",
"checkUpdate": "Check update",
"tabAnimation": "Tab animation", "tabAnimation": "Tab animation",
"tabAnimationDesc": "When enabled, the home tab will add a toggle animation", "tabAnimationDesc": "When enabled, the home tab will add a toggle animation",
"desc": "A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.", "desc": "A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.",
"startVpn": "Staring VPN...", "startVpn": "Staring VPN...",
"stopVpn": "Stopping VPN...", "stopVpn": "Stopping VPN...",
"discovery": "Discovery a new version" "discovery": "Discovery a new version",
"compatible": "Compatibility mode",
"compatibleDesc": "Opening it will lose part of its application ability and gain the support of full amount of Clash.",
"notSelectedTip": "The current proxy group cannot be selected.",
"tip": "tip",
"backupAndRecovery": "Backup and Recovery",
"backupAndRecoveryDesc": "Sync data by WebDAV",
"account": "Account",
"backup": "Backup",
"backupDesc": "Backup local data to WebDAV",
"recovery": "Recovery",
"recoveryDesc": "Recovery data from WebDAV",
"recoveryProfiles": "Only recovery profiles",
"recoveryAll": "Recovery all data",
"recoverySuccess": "Recovery success",
"backupSuccess": "Backup success",
"noInfo": "No info",
"pleaseBindWebDAV": "Please bind WebDAV",
"bind": "Bind",
"connectivity": "Connectivity",
"webDAVConfiguration": "WebDAV configuration",
"address": "Address",
"addressHelp": "WebDAV server address",
"addressTip": "Please enter a valid WebDAV address",
"password": "Password",
"passwordTip": "Password cannot be empty",
"accountTip": "Account cannot be empty",
"checkUpdate": "Check for updates",
"discoverNewVersion": "Discover the new version",
"checkUpdateError": "The current application is already the latest version",
"goDownload": "Go to download"
} }

View File

@@ -35,7 +35,7 @@
"overrideDesc": "覆写代理相关配置", "overrideDesc": "覆写代理相关配置",
"allowLan": "局域网代理", "allowLan": "局域网代理",
"allowLanDesc": "允许通过局域网访问代理", "allowLanDesc": "允许通过局域网访问代理",
"tun": "虚拟网络设备", "tun": "Tun模式",
"tunDesc": "仅在管理员模式生效", "tunDesc": "仅在管理员模式生效",
"minimizeOnExit": "退出时最小化", "minimizeOnExit": "退出时最小化",
"minimizeOnExitDesc": "修改系统默认退出事件", "minimizeOnExitDesc": "修改系统默认退出事件",
@@ -47,6 +47,8 @@
"autoRunDesc": "应用打开时自动运行", "autoRunDesc": "应用打开时自动运行",
"logcat": "日志捕获", "logcat": "日志捕获",
"logcatDesc": "禁用将会隐藏日志入口", "logcatDesc": "禁用将会隐藏日志入口",
"autoCheckUpdate": "自动检查更新",
"autoCheckUpdateDesc": "应用启动时自动检查更新",
"accessControl": "访问控制", "accessControl": "访问控制",
"accessControlDesc": "配置应用访问代理", "accessControlDesc": "配置应用访问代理",
"application": "应用程序", "application": "应用程序",
@@ -92,6 +94,7 @@
"delaySort": "按延迟排序", "delaySort": "按延迟排序",
"nameSort": "按名称排序", "nameSort": "按名称排序",
"pleaseUploadFile": "请上传文件", "pleaseUploadFile": "请上传文件",
"pleaseUploadValidQrcode": "请上传有效的二维码",
"blacklistMode": "黑名单模式", "blacklistMode": "黑名单模式",
"whitelistMode": "白名单模式", "whitelistMode": "白名单模式",
"filterSystemApp": "过滤系统应用", "filterSystemApp": "过滤系统应用",
@@ -113,11 +116,40 @@
"systemProxy": "系统代理", "systemProxy": "系统代理",
"project": "项目", "project": "项目",
"core": "内核", "core": "内核",
"checkUpdate": "检查更新",
"tabAnimation": "选项卡动画", "tabAnimation": "选项卡动画",
"tabAnimationDesc": "开启后,主页选项卡将添加切换动画", "tabAnimationDesc": "开启后,主页选项卡将添加切换动画",
"desc": "基于ClashMeta的多平台代理客户端简单易用开源无广告。", "desc": "基于ClashMeta的多平台代理客户端简单易用开源无广告。",
"startVpn": "正在启动VPN...", "startVpn": "正在启动VPN...",
"stopVpn": "正在停止VPN...", "stopVpn": "正在停止VPN...",
"discovery": "发现新版本" "discovery": "发现新版本",
"compatible": "兼容模式",
"compatibleDesc": "开启将失去部分应用能力获得全量的Clash的支持",
"notSelectedTip": "当前代理组无法选中",
"tip": "提示",
"backupAndRecovery": "备份与恢复",
"backupAndRecoveryDesc": "通过WebDAV同步数据",
"account": "账号",
"backup": "备份",
"backupDesc": "备份数据到WebDAV",
"recovery": "恢复",
"recoveryDesc": "从WebDAV恢复数据",
"recoveryProfiles": "仅恢复配置文件",
"recoveryAll": "恢复所有数据",
"recoverySuccess": "恢复成功",
"backupSuccess": "备份成功",
"noInfo": "暂无信息",
"pleaseBindWebDAV": "请绑定WebDAV",
"bind": "绑定",
"connectivity": "连通性:",
"webDAVConfiguration": "WebDAV配置",
"address": "地址",
"addressHelp": "WebDAV服务器地址",
"addressTip": "请输入有效的WebDAV地址",
"password": "密码",
"passwordTip": "密码不能为空",
"accountTip": "账号不能为空",
"checkUpdate": "检查更新",
"discoverNewVersion": "发现新版本",
"checkUpdateError": "当前应用已经是最新版了",
"goDownload": "前往下载"
} }

View File

@@ -30,7 +30,15 @@ class MessageLookup extends MessageLookupByLibrary {
"Configure application access proxy"), "Configure application access proxy"),
"accessControlNotAllowDesc": MessageLookupByLibrary.simpleMessage( "accessControlNotAllowDesc": MessageLookupByLibrary.simpleMessage(
"The selected application will be excluded from VPN"), "The selected application will be excluded from VPN"),
"account": MessageLookupByLibrary.simpleMessage("Account"),
"accountTip":
MessageLookupByLibrary.simpleMessage("Account cannot be empty"),
"add": MessageLookupByLibrary.simpleMessage("Add"), "add": MessageLookupByLibrary.simpleMessage("Add"),
"address": MessageLookupByLibrary.simpleMessage("Address"),
"addressHelp":
MessageLookupByLibrary.simpleMessage("WebDAV server address"),
"addressTip": MessageLookupByLibrary.simpleMessage(
"Please enter a valid WebDAV address"),
"ago": MessageLookupByLibrary.simpleMessage(" Ago"), "ago": MessageLookupByLibrary.simpleMessage(" Ago"),
"allowLan": MessageLookupByLibrary.simpleMessage("AllowLan"), "allowLan": MessageLookupByLibrary.simpleMessage("AllowLan"),
"allowLanDesc": MessageLookupByLibrary.simpleMessage( "allowLanDesc": MessageLookupByLibrary.simpleMessage(
@@ -41,6 +49,10 @@ class MessageLookup extends MessageLookupByLibrary {
"applicationDesc": MessageLookupByLibrary.simpleMessage( "applicationDesc": MessageLookupByLibrary.simpleMessage(
"Modify application related settings"), "Modify application related settings"),
"auto": MessageLookupByLibrary.simpleMessage("Auto"), "auto": MessageLookupByLibrary.simpleMessage("Auto"),
"autoCheckUpdate":
MessageLookupByLibrary.simpleMessage("Auto check updates"),
"autoCheckUpdateDesc": MessageLookupByLibrary.simpleMessage(
"Auto check for updates when the app starts"),
"autoLaunch": MessageLookupByLibrary.simpleMessage("AutoLaunch"), "autoLaunch": MessageLookupByLibrary.simpleMessage("AutoLaunch"),
"autoLaunchDesc": MessageLookupByLibrary.simpleMessage( "autoLaunchDesc": MessageLookupByLibrary.simpleMessage(
"Follow the system self startup"), "Follow the system self startup"),
@@ -50,13 +62,30 @@ class MessageLookup extends MessageLookupByLibrary {
"autoUpdate": MessageLookupByLibrary.simpleMessage("Auto update"), "autoUpdate": MessageLookupByLibrary.simpleMessage("Auto update"),
"autoUpdateInterval": MessageLookupByLibrary.simpleMessage( "autoUpdateInterval": MessageLookupByLibrary.simpleMessage(
"Auto update interval (minutes)"), "Auto update interval (minutes)"),
"backup": MessageLookupByLibrary.simpleMessage("Backup"),
"backupAndRecovery":
MessageLookupByLibrary.simpleMessage("Backup and Recovery"),
"backupAndRecoveryDesc":
MessageLookupByLibrary.simpleMessage("Sync data by WebDAV"),
"backupDesc":
MessageLookupByLibrary.simpleMessage("Backup local data to WebDAV"),
"backupSuccess": MessageLookupByLibrary.simpleMessage("Backup success"),
"bind": MessageLookupByLibrary.simpleMessage("Bind"),
"blacklistMode": MessageLookupByLibrary.simpleMessage("Blacklist mode"), "blacklistMode": MessageLookupByLibrary.simpleMessage("Blacklist mode"),
"cancelFilterSystemApp": "cancelFilterSystemApp":
MessageLookupByLibrary.simpleMessage("Cancel filter system app"), MessageLookupByLibrary.simpleMessage("Cancel filter system app"),
"cancelSelectAll": "cancelSelectAll":
MessageLookupByLibrary.simpleMessage("Cancel select all"), MessageLookupByLibrary.simpleMessage("Cancel select all"),
"checkUpdate": MessageLookupByLibrary.simpleMessage("Check update"), "checkUpdate":
MessageLookupByLibrary.simpleMessage("Check for updates"),
"checkUpdateError": MessageLookupByLibrary.simpleMessage(
"The current application is already the latest version"),
"compatible":
MessageLookupByLibrary.simpleMessage("Compatibility mode"),
"compatibleDesc": MessageLookupByLibrary.simpleMessage(
"Opening it will lose part of its application ability and gain the support of full amount of Clash."),
"confirm": MessageLookupByLibrary.simpleMessage("Confirm"), "confirm": MessageLookupByLibrary.simpleMessage("Confirm"),
"connectivity": MessageLookupByLibrary.simpleMessage("Connectivity"),
"core": MessageLookupByLibrary.simpleMessage("Core"), "core": MessageLookupByLibrary.simpleMessage("Core"),
"coreInfo": MessageLookupByLibrary.simpleMessage("Core info"), "coreInfo": MessageLookupByLibrary.simpleMessage("Core info"),
"create": MessageLookupByLibrary.simpleMessage("Create"), "create": MessageLookupByLibrary.simpleMessage("Create"),
@@ -70,6 +99,8 @@ class MessageLookup extends MessageLookupByLibrary {
"desc": MessageLookupByLibrary.simpleMessage( "desc": MessageLookupByLibrary.simpleMessage(
"A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free."), "A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free."),
"direct": MessageLookupByLibrary.simpleMessage("Direct"), "direct": MessageLookupByLibrary.simpleMessage("Direct"),
"discoverNewVersion":
MessageLookupByLibrary.simpleMessage("Discover the new version"),
"discovery": "discovery":
MessageLookupByLibrary.simpleMessage("Discovery a new version"), MessageLookupByLibrary.simpleMessage("Discovery a new version"),
"doYouWantToPass": "doYouWantToPass":
@@ -84,6 +115,7 @@ class MessageLookup extends MessageLookupByLibrary {
"filterSystemApp": "filterSystemApp":
MessageLookupByLibrary.simpleMessage("Filter system app"), MessageLookupByLibrary.simpleMessage("Filter system app"),
"global": MessageLookupByLibrary.simpleMessage("Global"), "global": MessageLookupByLibrary.simpleMessage("Global"),
"goDownload": MessageLookupByLibrary.simpleMessage("Go to download"),
"hours": MessageLookupByLibrary.simpleMessage("Hours"), "hours": MessageLookupByLibrary.simpleMessage("Hours"),
"importFromURL": "importFromURL":
MessageLookupByLibrary.simpleMessage("Import from URL"), MessageLookupByLibrary.simpleMessage("Import from URL"),
@@ -108,10 +140,13 @@ class MessageLookup extends MessageLookupByLibrary {
"networkDetection": "networkDetection":
MessageLookupByLibrary.simpleMessage("Network detection"), MessageLookupByLibrary.simpleMessage("Network detection"),
"networkSpeed": MessageLookupByLibrary.simpleMessage("Network speed"), "networkSpeed": MessageLookupByLibrary.simpleMessage("Network speed"),
"noInfo": MessageLookupByLibrary.simpleMessage("No info"),
"noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("No more info"), "noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("No more info"),
"noProxy": MessageLookupByLibrary.simpleMessage("No proxy"), "noProxy": MessageLookupByLibrary.simpleMessage("No proxy"),
"noProxyDesc": MessageLookupByLibrary.simpleMessage( "noProxyDesc": MessageLookupByLibrary.simpleMessage(
"Please create a profile or add a valid profile"), "Please create a profile or add a valid profile"),
"notSelectedTip": MessageLookupByLibrary.simpleMessage(
"The current proxy group cannot be selected."),
"nullCoreInfoDesc": "nullCoreInfoDesc":
MessageLookupByLibrary.simpleMessage("Unable to obtain core info"), MessageLookupByLibrary.simpleMessage("Unable to obtain core info"),
"nullLogsDesc": MessageLookupByLibrary.simpleMessage("No logs"), "nullLogsDesc": MessageLookupByLibrary.simpleMessage("No logs"),
@@ -122,8 +157,15 @@ class MessageLookup extends MessageLookupByLibrary {
"override": MessageLookupByLibrary.simpleMessage("Override"), "override": MessageLookupByLibrary.simpleMessage("Override"),
"overrideDesc": MessageLookupByLibrary.simpleMessage( "overrideDesc": MessageLookupByLibrary.simpleMessage(
"Override Proxy related config"), "Override Proxy related config"),
"password": MessageLookupByLibrary.simpleMessage("Password"),
"passwordTip":
MessageLookupByLibrary.simpleMessage("Password cannot be empty"),
"pleaseBindWebDAV":
MessageLookupByLibrary.simpleMessage("Please bind WebDAV"),
"pleaseUploadFile": "pleaseUploadFile":
MessageLookupByLibrary.simpleMessage("Please upload file"), MessageLookupByLibrary.simpleMessage("Please upload file"),
"pleaseUploadValidQrcode": MessageLookupByLibrary.simpleMessage(
"Please upload a valid QR code"),
"port": MessageLookupByLibrary.simpleMessage("Port"), "port": MessageLookupByLibrary.simpleMessage("Port"),
"preview": MessageLookupByLibrary.simpleMessage("Preview"), "preview": MessageLookupByLibrary.simpleMessage("Preview"),
"profile": MessageLookupByLibrary.simpleMessage("Profile"), "profile": MessageLookupByLibrary.simpleMessage("Profile"),
@@ -148,6 +190,15 @@ class MessageLookup extends MessageLookupByLibrary {
"qrcode": MessageLookupByLibrary.simpleMessage("QR code"), "qrcode": MessageLookupByLibrary.simpleMessage("QR code"),
"qrcodeDesc": MessageLookupByLibrary.simpleMessage( "qrcodeDesc": MessageLookupByLibrary.simpleMessage(
"Scan QR code to obtain profile"), "Scan QR code to obtain profile"),
"recovery": MessageLookupByLibrary.simpleMessage("Recovery"),
"recoveryAll":
MessageLookupByLibrary.simpleMessage("Recovery all data"),
"recoveryDesc":
MessageLookupByLibrary.simpleMessage("Recovery data from WebDAV"),
"recoveryProfiles":
MessageLookupByLibrary.simpleMessage("Only recovery profiles"),
"recoverySuccess":
MessageLookupByLibrary.simpleMessage("Recovery success"),
"rule": MessageLookupByLibrary.simpleMessage("Rule"), "rule": MessageLookupByLibrary.simpleMessage("Rule"),
"save": MessageLookupByLibrary.simpleMessage("Save"), "save": MessageLookupByLibrary.simpleMessage("Save"),
"selectAll": MessageLookupByLibrary.simpleMessage("Select all"), "selectAll": MessageLookupByLibrary.simpleMessage("Select all"),
@@ -169,9 +220,10 @@ class MessageLookup extends MessageLookupByLibrary {
"themeDesc": MessageLookupByLibrary.simpleMessage( "themeDesc": MessageLookupByLibrary.simpleMessage(
"Set dark mode,adjust the color"), "Set dark mode,adjust the color"),
"themeMode": MessageLookupByLibrary.simpleMessage("Theme mode"), "themeMode": MessageLookupByLibrary.simpleMessage("Theme mode"),
"tip": MessageLookupByLibrary.simpleMessage("tip"),
"tools": MessageLookupByLibrary.simpleMessage("Tools"), "tools": MessageLookupByLibrary.simpleMessage("Tools"),
"trafficUsage": MessageLookupByLibrary.simpleMessage("Traffic usage"), "trafficUsage": MessageLookupByLibrary.simpleMessage("Traffic usage"),
"tun": MessageLookupByLibrary.simpleMessage("Tun"), "tun": MessageLookupByLibrary.simpleMessage("Tun mode"),
"tunDesc": MessageLookupByLibrary.simpleMessage( "tunDesc": MessageLookupByLibrary.simpleMessage(
"only effective in administrator mode"), "only effective in administrator mode"),
"unableToUpdateCurrentProfileDesc": "unableToUpdateCurrentProfileDesc":
@@ -182,6 +234,8 @@ class MessageLookup extends MessageLookupByLibrary {
"url": MessageLookupByLibrary.simpleMessage("URL"), "url": MessageLookupByLibrary.simpleMessage("URL"),
"urlDesc": "urlDesc":
MessageLookupByLibrary.simpleMessage("Obtain profile through URL"), MessageLookupByLibrary.simpleMessage("Obtain profile through URL"),
"webDAVConfiguration":
MessageLookupByLibrary.simpleMessage("WebDAV configuration"),
"whitelistMode": MessageLookupByLibrary.simpleMessage("Whitelist mode"), "whitelistMode": MessageLookupByLibrary.simpleMessage("Whitelist mode"),
"years": MessageLookupByLibrary.simpleMessage("Years"), "years": MessageLookupByLibrary.simpleMessage("Years"),
"zh_CN": MessageLookupByLibrary.simpleMessage("Simplified Chinese") "zh_CN": MessageLookupByLibrary.simpleMessage("Simplified Chinese")

View File

@@ -29,7 +29,12 @@ class MessageLookup extends MessageLookupByLibrary {
"accessControlDesc": MessageLookupByLibrary.simpleMessage("配置应用访问代理"), "accessControlDesc": MessageLookupByLibrary.simpleMessage("配置应用访问代理"),
"accessControlNotAllowDesc": "accessControlNotAllowDesc":
MessageLookupByLibrary.simpleMessage("选中应用将会被排除在VPN之外"), MessageLookupByLibrary.simpleMessage("选中应用将会被排除在VPN之外"),
"account": MessageLookupByLibrary.simpleMessage("账号"),
"accountTip": MessageLookupByLibrary.simpleMessage("账号不能为空"),
"add": MessageLookupByLibrary.simpleMessage("添加"), "add": MessageLookupByLibrary.simpleMessage("添加"),
"address": MessageLookupByLibrary.simpleMessage("地址"),
"addressHelp": MessageLookupByLibrary.simpleMessage("WebDAV服务器地址"),
"addressTip": MessageLookupByLibrary.simpleMessage("请输入有效的WebDAV地址"),
"ago": MessageLookupByLibrary.simpleMessage(""), "ago": MessageLookupByLibrary.simpleMessage(""),
"allowLan": MessageLookupByLibrary.simpleMessage("局域网代理"), "allowLan": MessageLookupByLibrary.simpleMessage("局域网代理"),
"allowLanDesc": MessageLookupByLibrary.simpleMessage("允许通过局域网访问代理"), "allowLanDesc": MessageLookupByLibrary.simpleMessage("允许通过局域网访问代理"),
@@ -37,6 +42,9 @@ class MessageLookup extends MessageLookupByLibrary {
"application": MessageLookupByLibrary.simpleMessage("应用程序"), "application": MessageLookupByLibrary.simpleMessage("应用程序"),
"applicationDesc": MessageLookupByLibrary.simpleMessage("修改应用程序相关设置"), "applicationDesc": MessageLookupByLibrary.simpleMessage("修改应用程序相关设置"),
"auto": MessageLookupByLibrary.simpleMessage("自动"), "auto": MessageLookupByLibrary.simpleMessage("自动"),
"autoCheckUpdate": MessageLookupByLibrary.simpleMessage("自动检查更新"),
"autoCheckUpdateDesc":
MessageLookupByLibrary.simpleMessage("应用启动时自动检查更新"),
"autoLaunch": MessageLookupByLibrary.simpleMessage("自启动"), "autoLaunch": MessageLookupByLibrary.simpleMessage("自启动"),
"autoLaunchDesc": MessageLookupByLibrary.simpleMessage("跟随系统自启动"), "autoLaunchDesc": MessageLookupByLibrary.simpleMessage("跟随系统自启动"),
"autoRun": MessageLookupByLibrary.simpleMessage("自动运行"), "autoRun": MessageLookupByLibrary.simpleMessage("自动运行"),
@@ -44,12 +52,24 @@ class MessageLookup extends MessageLookupByLibrary {
"autoUpdate": MessageLookupByLibrary.simpleMessage("自动更新"), "autoUpdate": MessageLookupByLibrary.simpleMessage("自动更新"),
"autoUpdateInterval": "autoUpdateInterval":
MessageLookupByLibrary.simpleMessage("自动更新间隔(分钟)"), MessageLookupByLibrary.simpleMessage("自动更新间隔(分钟)"),
"backup": MessageLookupByLibrary.simpleMessage("备份"),
"backupAndRecovery": MessageLookupByLibrary.simpleMessage("备份与恢复"),
"backupAndRecoveryDesc":
MessageLookupByLibrary.simpleMessage("通过WebDAV同步数据"),
"backupDesc": MessageLookupByLibrary.simpleMessage("备份数据到WebDAV"),
"backupSuccess": MessageLookupByLibrary.simpleMessage("备份成功"),
"bind": MessageLookupByLibrary.simpleMessage("绑定"),
"blacklistMode": MessageLookupByLibrary.simpleMessage("黑名单模式"), "blacklistMode": MessageLookupByLibrary.simpleMessage("黑名单模式"),
"cancelFilterSystemApp": "cancelFilterSystemApp":
MessageLookupByLibrary.simpleMessage("取消过滤系统应用"), MessageLookupByLibrary.simpleMessage("取消过滤系统应用"),
"cancelSelectAll": MessageLookupByLibrary.simpleMessage("取消全选"), "cancelSelectAll": MessageLookupByLibrary.simpleMessage("取消全选"),
"checkUpdate": MessageLookupByLibrary.simpleMessage("检查更新"), "checkUpdate": MessageLookupByLibrary.simpleMessage("检查更新"),
"checkUpdateError": MessageLookupByLibrary.simpleMessage("当前应用已经是最新版了"),
"compatible": MessageLookupByLibrary.simpleMessage("兼容模式"),
"compatibleDesc":
MessageLookupByLibrary.simpleMessage("开启将失去部分应用能力获得全量的Clash的支持"),
"confirm": MessageLookupByLibrary.simpleMessage("确定"), "confirm": MessageLookupByLibrary.simpleMessage("确定"),
"connectivity": MessageLookupByLibrary.simpleMessage("连通性:"),
"core": MessageLookupByLibrary.simpleMessage("内核"), "core": MessageLookupByLibrary.simpleMessage("内核"),
"coreInfo": MessageLookupByLibrary.simpleMessage("内核信息"), "coreInfo": MessageLookupByLibrary.simpleMessage("内核信息"),
"create": MessageLookupByLibrary.simpleMessage("创建"), "create": MessageLookupByLibrary.simpleMessage("创建"),
@@ -63,6 +83,7 @@ class MessageLookup extends MessageLookupByLibrary {
"desc": MessageLookupByLibrary.simpleMessage( "desc": MessageLookupByLibrary.simpleMessage(
"基于ClashMeta的多平台代理客户端简单易用开源无广告。"), "基于ClashMeta的多平台代理客户端简单易用开源无广告。"),
"direct": MessageLookupByLibrary.simpleMessage("直连"), "direct": MessageLookupByLibrary.simpleMessage("直连"),
"discoverNewVersion": MessageLookupByLibrary.simpleMessage("发现新版本"),
"discovery": MessageLookupByLibrary.simpleMessage("发现新版本"), "discovery": MessageLookupByLibrary.simpleMessage("发现新版本"),
"doYouWantToPass": MessageLookupByLibrary.simpleMessage("是否要通过"), "doYouWantToPass": MessageLookupByLibrary.simpleMessage("是否要通过"),
"download": MessageLookupByLibrary.simpleMessage("下载"), "download": MessageLookupByLibrary.simpleMessage("下载"),
@@ -73,6 +94,7 @@ class MessageLookup extends MessageLookupByLibrary {
"fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"), "fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
"filterSystemApp": MessageLookupByLibrary.simpleMessage("过滤系统应用"), "filterSystemApp": MessageLookupByLibrary.simpleMessage("过滤系统应用"),
"global": MessageLookupByLibrary.simpleMessage("全局"), "global": MessageLookupByLibrary.simpleMessage("全局"),
"goDownload": MessageLookupByLibrary.simpleMessage("前往下载"),
"hours": MessageLookupByLibrary.simpleMessage("小时"), "hours": MessageLookupByLibrary.simpleMessage("小时"),
"importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"), "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
"just": MessageLookupByLibrary.simpleMessage("刚刚"), "just": MessageLookupByLibrary.simpleMessage("刚刚"),
@@ -93,10 +115,12 @@ class MessageLookup extends MessageLookupByLibrary {
"nameSort": MessageLookupByLibrary.simpleMessage("按名称排序"), "nameSort": MessageLookupByLibrary.simpleMessage("按名称排序"),
"networkDetection": MessageLookupByLibrary.simpleMessage("网络检测"), "networkDetection": MessageLookupByLibrary.simpleMessage("网络检测"),
"networkSpeed": MessageLookupByLibrary.simpleMessage("网络速度"), "networkSpeed": MessageLookupByLibrary.simpleMessage("网络速度"),
"noInfo": MessageLookupByLibrary.simpleMessage("暂无信息"),
"noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("暂无更多信息"), "noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("暂无更多信息"),
"noProxy": MessageLookupByLibrary.simpleMessage("暂无代理"), "noProxy": MessageLookupByLibrary.simpleMessage("暂无代理"),
"noProxyDesc": "noProxyDesc":
MessageLookupByLibrary.simpleMessage("请创建配置文件或者添加有效配置文件"), MessageLookupByLibrary.simpleMessage("请创建配置文件或者添加有效配置文件"),
"notSelectedTip": MessageLookupByLibrary.simpleMessage("当前代理组无法选中"),
"nullCoreInfoDesc": MessageLookupByLibrary.simpleMessage("无法获取内核信息"), "nullCoreInfoDesc": MessageLookupByLibrary.simpleMessage("无法获取内核信息"),
"nullLogsDesc": MessageLookupByLibrary.simpleMessage("暂无日志"), "nullLogsDesc": MessageLookupByLibrary.simpleMessage("暂无日志"),
"nullProfileDesc": "nullProfileDesc":
@@ -105,7 +129,12 @@ class MessageLookup extends MessageLookupByLibrary {
"outboundMode": MessageLookupByLibrary.simpleMessage("出站模式"), "outboundMode": MessageLookupByLibrary.simpleMessage("出站模式"),
"override": MessageLookupByLibrary.simpleMessage("覆写"), "override": MessageLookupByLibrary.simpleMessage("覆写"),
"overrideDesc": MessageLookupByLibrary.simpleMessage("覆写代理相关配置"), "overrideDesc": MessageLookupByLibrary.simpleMessage("覆写代理相关配置"),
"password": MessageLookupByLibrary.simpleMessage("密码"),
"passwordTip": MessageLookupByLibrary.simpleMessage("密码不能为空"),
"pleaseBindWebDAV": MessageLookupByLibrary.simpleMessage("请绑定WebDAV"),
"pleaseUploadFile": MessageLookupByLibrary.simpleMessage("请上传文件"), "pleaseUploadFile": MessageLookupByLibrary.simpleMessage("请上传文件"),
"pleaseUploadValidQrcode":
MessageLookupByLibrary.simpleMessage("请上传有效的二维码"),
"port": MessageLookupByLibrary.simpleMessage("端口"), "port": MessageLookupByLibrary.simpleMessage("端口"),
"preview": MessageLookupByLibrary.simpleMessage("预览"), "preview": MessageLookupByLibrary.simpleMessage("预览"),
"profile": MessageLookupByLibrary.simpleMessage("配置"), "profile": MessageLookupByLibrary.simpleMessage("配置"),
@@ -127,6 +156,11 @@ class MessageLookup extends MessageLookupByLibrary {
"proxyPort": MessageLookupByLibrary.simpleMessage("代理端口"), "proxyPort": MessageLookupByLibrary.simpleMessage("代理端口"),
"qrcode": MessageLookupByLibrary.simpleMessage("二维码"), "qrcode": MessageLookupByLibrary.simpleMessage("二维码"),
"qrcodeDesc": MessageLookupByLibrary.simpleMessage("扫描二维码获取配置文件"), "qrcodeDesc": MessageLookupByLibrary.simpleMessage("扫描二维码获取配置文件"),
"recovery": MessageLookupByLibrary.simpleMessage("恢复"),
"recoveryAll": MessageLookupByLibrary.simpleMessage("恢复所有数据"),
"recoveryDesc": MessageLookupByLibrary.simpleMessage("从WebDAV恢复数据"),
"recoveryProfiles": MessageLookupByLibrary.simpleMessage("仅恢复配置文件"),
"recoverySuccess": MessageLookupByLibrary.simpleMessage("恢复成功"),
"rule": MessageLookupByLibrary.simpleMessage("规则"), "rule": MessageLookupByLibrary.simpleMessage("规则"),
"save": MessageLookupByLibrary.simpleMessage("保存"), "save": MessageLookupByLibrary.simpleMessage("保存"),
"selectAll": MessageLookupByLibrary.simpleMessage("全选"), "selectAll": MessageLookupByLibrary.simpleMessage("全选"),
@@ -146,9 +180,10 @@ class MessageLookup extends MessageLookupByLibrary {
"themeColor": MessageLookupByLibrary.simpleMessage("主题色彩"), "themeColor": MessageLookupByLibrary.simpleMessage("主题色彩"),
"themeDesc": MessageLookupByLibrary.simpleMessage("设置深色模式,调整色彩"), "themeDesc": MessageLookupByLibrary.simpleMessage("设置深色模式,调整色彩"),
"themeMode": MessageLookupByLibrary.simpleMessage("主题模式"), "themeMode": MessageLookupByLibrary.simpleMessage("主题模式"),
"tip": MessageLookupByLibrary.simpleMessage("提示"),
"tools": MessageLookupByLibrary.simpleMessage("工具"), "tools": MessageLookupByLibrary.simpleMessage("工具"),
"trafficUsage": MessageLookupByLibrary.simpleMessage("流量统计"), "trafficUsage": MessageLookupByLibrary.simpleMessage("流量统计"),
"tun": MessageLookupByLibrary.simpleMessage("虚拟网络设备"), "tun": MessageLookupByLibrary.simpleMessage("Tun模式"),
"tunDesc": MessageLookupByLibrary.simpleMessage("仅在管理员模式生效"), "tunDesc": MessageLookupByLibrary.simpleMessage("仅在管理员模式生效"),
"unableToUpdateCurrentProfileDesc": "unableToUpdateCurrentProfileDesc":
MessageLookupByLibrary.simpleMessage("无法更新当前配置文件"), MessageLookupByLibrary.simpleMessage("无法更新当前配置文件"),
@@ -156,6 +191,7 @@ class MessageLookup extends MessageLookupByLibrary {
"upload": MessageLookupByLibrary.simpleMessage("上传"), "upload": MessageLookupByLibrary.simpleMessage("上传"),
"url": MessageLookupByLibrary.simpleMessage("URL"), "url": MessageLookupByLibrary.simpleMessage("URL"),
"urlDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"), "urlDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
"webDAVConfiguration": MessageLookupByLibrary.simpleMessage("WebDAV配置"),
"whitelistMode": MessageLookupByLibrary.simpleMessage("白名单模式"), "whitelistMode": MessageLookupByLibrary.simpleMessage("白名单模式"),
"years": MessageLookupByLibrary.simpleMessage(""), "years": MessageLookupByLibrary.simpleMessage(""),
"zh_CN": MessageLookupByLibrary.simpleMessage("中文简体") "zh_CN": MessageLookupByLibrary.simpleMessage("中文简体")

View File

@@ -410,10 +410,10 @@ class AppLocalizations {
); );
} }
/// `Tun` /// `Tun mode`
String get tun { String get tun {
return Intl.message( return Intl.message(
'Tun', 'Tun mode',
name: 'tun', name: 'tun',
desc: '', desc: '',
args: [], args: [],
@@ -530,6 +530,26 @@ class AppLocalizations {
); );
} }
/// `Auto check updates`
String get autoCheckUpdate {
return Intl.message(
'Auto check updates',
name: 'autoCheckUpdate',
desc: '',
args: [],
);
}
/// `Auto check for updates when the app starts`
String get autoCheckUpdateDesc {
return Intl.message(
'Auto check for updates when the app starts',
name: 'autoCheckUpdateDesc',
desc: '',
args: [],
);
}
/// `AccessControl` /// `AccessControl`
String get accessControl { String get accessControl {
return Intl.message( return Intl.message(
@@ -980,6 +1000,16 @@ class AppLocalizations {
); );
} }
/// `Please upload a valid QR code`
String get pleaseUploadValidQrcode {
return Intl.message(
'Please upload a valid QR code',
name: 'pleaseUploadValidQrcode',
desc: '',
args: [],
);
}
/// `Blacklist mode` /// `Blacklist mode`
String get blacklistMode { String get blacklistMode {
return Intl.message( return Intl.message(
@@ -1190,16 +1220,6 @@ class AppLocalizations {
); );
} }
/// `Check update`
String get checkUpdate {
return Intl.message(
'Check update',
name: 'checkUpdate',
desc: '',
args: [],
);
}
/// `Tab animation` /// `Tab animation`
String get tabAnimation { String get tabAnimation {
return Intl.message( return Intl.message(
@@ -1259,6 +1279,306 @@ class AppLocalizations {
args: [], args: [],
); );
} }
/// `Compatibility mode`
String get compatible {
return Intl.message(
'Compatibility mode',
name: 'compatible',
desc: '',
args: [],
);
}
/// `Opening it will lose part of its application ability and gain the support of full amount of Clash.`
String get compatibleDesc {
return Intl.message(
'Opening it will lose part of its application ability and gain the support of full amount of Clash.',
name: 'compatibleDesc',
desc: '',
args: [],
);
}
/// `The current proxy group cannot be selected.`
String get notSelectedTip {
return Intl.message(
'The current proxy group cannot be selected.',
name: 'notSelectedTip',
desc: '',
args: [],
);
}
/// `tip`
String get tip {
return Intl.message(
'tip',
name: 'tip',
desc: '',
args: [],
);
}
/// `Backup and Recovery`
String get backupAndRecovery {
return Intl.message(
'Backup and Recovery',
name: 'backupAndRecovery',
desc: '',
args: [],
);
}
/// `Sync data by WebDAV`
String get backupAndRecoveryDesc {
return Intl.message(
'Sync data by WebDAV',
name: 'backupAndRecoveryDesc',
desc: '',
args: [],
);
}
/// `Account`
String get account {
return Intl.message(
'Account',
name: 'account',
desc: '',
args: [],
);
}
/// `Backup`
String get backup {
return Intl.message(
'Backup',
name: 'backup',
desc: '',
args: [],
);
}
/// `Backup local data to WebDAV`
String get backupDesc {
return Intl.message(
'Backup local data to WebDAV',
name: 'backupDesc',
desc: '',
args: [],
);
}
/// `Recovery`
String get recovery {
return Intl.message(
'Recovery',
name: 'recovery',
desc: '',
args: [],
);
}
/// `Recovery data from WebDAV`
String get recoveryDesc {
return Intl.message(
'Recovery data from WebDAV',
name: 'recoveryDesc',
desc: '',
args: [],
);
}
/// `Only recovery profiles`
String get recoveryProfiles {
return Intl.message(
'Only recovery profiles',
name: 'recoveryProfiles',
desc: '',
args: [],
);
}
/// `Recovery all data`
String get recoveryAll {
return Intl.message(
'Recovery all data',
name: 'recoveryAll',
desc: '',
args: [],
);
}
/// `Recovery success`
String get recoverySuccess {
return Intl.message(
'Recovery success',
name: 'recoverySuccess',
desc: '',
args: [],
);
}
/// `Backup success`
String get backupSuccess {
return Intl.message(
'Backup success',
name: 'backupSuccess',
desc: '',
args: [],
);
}
/// `No info`
String get noInfo {
return Intl.message(
'No info',
name: 'noInfo',
desc: '',
args: [],
);
}
/// `Please bind WebDAV`
String get pleaseBindWebDAV {
return Intl.message(
'Please bind WebDAV',
name: 'pleaseBindWebDAV',
desc: '',
args: [],
);
}
/// `Bind`
String get bind {
return Intl.message(
'Bind',
name: 'bind',
desc: '',
args: [],
);
}
/// `Connectivity`
String get connectivity {
return Intl.message(
'Connectivity',
name: 'connectivity',
desc: '',
args: [],
);
}
/// `WebDAV configuration`
String get webDAVConfiguration {
return Intl.message(
'WebDAV configuration',
name: 'webDAVConfiguration',
desc: '',
args: [],
);
}
/// `Address`
String get address {
return Intl.message(
'Address',
name: 'address',
desc: '',
args: [],
);
}
/// `WebDAV server address`
String get addressHelp {
return Intl.message(
'WebDAV server address',
name: 'addressHelp',
desc: '',
args: [],
);
}
/// `Please enter a valid WebDAV address`
String get addressTip {
return Intl.message(
'Please enter a valid WebDAV address',
name: 'addressTip',
desc: '',
args: [],
);
}
/// `Password`
String get password {
return Intl.message(
'Password',
name: 'password',
desc: '',
args: [],
);
}
/// `Password cannot be empty`
String get passwordTip {
return Intl.message(
'Password cannot be empty',
name: 'passwordTip',
desc: '',
args: [],
);
}
/// `Account cannot be empty`
String get accountTip {
return Intl.message(
'Account cannot be empty',
name: 'accountTip',
desc: '',
args: [],
);
}
/// `Check for updates`
String get checkUpdate {
return Intl.message(
'Check for updates',
name: 'checkUpdate',
desc: '',
args: [],
);
}
/// `Discover the new version`
String get discoverNewVersion {
return Intl.message(
'Discover the new version',
name: 'discoverNewVersion',
desc: '',
args: [],
);
}
/// `The current application is already the latest version`
String get checkUpdateError {
return Intl.message(
'The current application is already the latest version',
name: 'checkUpdateError',
desc: '',
args: [],
);
}
/// `Go to download`
String get goDownload {
return Intl.message(
'Go to download',
name: 'goDownload',
desc: '',
args: [],
);
}
} }
class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> { class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {

View File

@@ -17,7 +17,12 @@ Future<void> main() async {
await window?.init(); await window?.init();
final config = await preferences.getConfig() ?? Config(); final config = await preferences.getConfig() ?? Config();
final clashConfig = await preferences.getClashConfig() ?? ClashConfig(); final clashConfig = await preferences.getClashConfig() ?? ClashConfig();
final appState = AppState(); final appState = AppState(
mode: clashConfig.mode,
isCompatible: config.isCompatible,
selectedMap: config.currentSelectedMap,
viewWidth: other.getViewWidth(),
);
await globalState.init( await globalState.init(
appState: appState, appState: appState,
config: config, config: config,
@@ -41,7 +46,11 @@ Future<void> vpnService() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
final config = await preferences.getConfig() ?? Config(); final config = await preferences.getConfig() ?? Config();
final clashConfig = await preferences.getClashConfig() ?? ClashConfig(); final clashConfig = await preferences.getClashConfig() ?? ClashConfig();
final appState = AppState(); final appState = AppState(
mode: clashConfig.mode,
isCompatible: config.isCompatible,
selectedMap: config.currentSelectedMap,
);
clashMessage.addListener(ClashMessageListenerWithVpn(onTun: (String fd) { clashMessage.addListener(ClashMessageListenerWithVpn(onTun: (String fd) {
proxyManager.setProtect( proxyManager.setProtect(
int.parse(fd), int.parse(fd),
@@ -54,7 +63,7 @@ Future<void> vpnService() async {
); );
final appLocalizations = await AppLocalizations.load( final appLocalizations = await AppLocalizations.load(
Other.getLocaleForString(config.locale) ?? other.getLocaleForString(config.locale) ??
WidgetsBinding.instance.platformDispatcher.locale, WidgetsBinding.instance.platformDispatcher.locale,
); );
@@ -78,6 +87,7 @@ Future<void> vpnService() async {
TileListenerWithVpn( TileListenerWithVpn(
onStop: () async { onStop: () async {
await app?.tip(appLocalizations.stopVpn); await app?.tip(appLocalizations.stopVpn);
await globalState.stopSystemProxy();
clashCore.shutdown(); clashCore.shutdown();
exit(0); exit(0);
}, },

View File

@@ -1,37 +1,52 @@
import 'package:collection/collection.dart'; import 'package:collection/collection.dart';
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/enum/enum.dart'; import 'package:fl_clash/enum/enum.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'ffi.dart'; import 'ffi.dart';
import 'log.dart'; import 'log.dart';
import 'navigation.dart'; import 'navigation.dart';
import 'package.dart'; import 'profile.dart';
import 'proxy.dart'; import 'proxy.dart';
import 'system_color_scheme.dart'; import 'system_color_scheme.dart';
import 'traffic.dart'; import 'traffic.dart';
import 'version.dart'; import 'version.dart';
typedef DelayMap = Map<String, int?>;
class AppState with ChangeNotifier { class AppState with ChangeNotifier {
List<NavigationItem> _navigationItems; List<NavigationItem> _navigationItems;
int? _runTime; int? _runTime;
bool _isInit; bool _isInit;
DelayMap _delayMap;
VersionInfo? _versionInfo; VersionInfo? _versionInfo;
List<Traffic> _traffics; List<Traffic> _traffics;
List<Log> _logs; List<Log> _logs;
List<Package> _packages;
String _currentLabel; String _currentLabel;
SystemColorSchemes _systemColorSchemes; SystemColorSchemes _systemColorSchemes;
num _sortNum;
Mode _mode;
DelayMap _delayMap;
SelectedMap _selectedMap;
bool _isCompatible;
List<Group> _groups; List<Group> _groups;
double _viewWidth;
AppState() AppState({
: _navigationItems = [], required Mode mode,
_delayMap = {}, double? viewWidth,
required bool isCompatible,
required SelectedMap selectedMap,
}) : _navigationItems = [],
_isInit = false, _isInit = false,
_currentLabel = "dashboard", _currentLabel = "dashboard",
_traffics = [], _traffics = [],
_logs = [], _logs = [],
_viewWidth = viewWidth ?? 0,
_selectedMap = selectedMap,
_sortNum = 0,
_mode = mode,
_delayMap = {},
_groups = [], _groups = [],
_packages = [], _isCompatible = isCompatible,
_systemColorSchemes = SystemColorSchemes(); _systemColorSchemes = SystemColorSchemes();
String get currentLabel => _currentLabel; String get currentLabel => _currentLabel;
@@ -52,6 +67,20 @@ class AppState with ChangeNotifier {
} }
} }
List<NavigationItem> get currentNavigationItems {
NavigationItemMode navigationItemMode;
if (_viewWidth <= maxMobileWidth) {
navigationItemMode = NavigationItemMode.mobile;
} else {
navigationItemMode = NavigationItemMode.desktop;
}
return navigationItems
.where(
(element) => element.modes.contains(navigationItemMode),
)
.toList();
}
bool get isInit => _isInit; bool get isInit => _isInit;
set isInit(bool value) { set isInit(bool value) {
@@ -70,20 +99,38 @@ class AppState with ChangeNotifier {
} }
} }
DelayMap get delayMap => _delayMap; String getDesc(String type, String? proxyName) {
final groupTypeNamesList = GroupType.values.map((e) => e.name).toList();
set delayMap(DelayMap value) { if (!groupTypeNamesList.contains(type)) {
if (_delayMap != value) { return type;
_delayMap = value; } else {
notifyListeners(); final index = groups.indexWhere((element) => element.name == proxyName);
if (index == -1) return type;
return "$type(${groups[index].now})";
} }
} }
setDelay(Delay delay) { String? getRealProxyName(String? proxyName) {
if (_delayMap[delay.name] != delay.value) { if (proxyName == null) return null;
_delayMap = Map.from(_delayMap)..[delay.name] = delay.value; final index = groups.indexWhere((element) => element.name == proxyName);
notifyListeners(); if (index == -1) return proxyName;
final group = groups[index];
return getRealProxyName(selectedMap.containsKey(proxyName)
? selectedMap[proxyName]
: group.now);
}
String? get showProxyName {
if (currentGroups.isEmpty) {
return UsedProxy.DIRECT.name;
} }
final firstGroup = currentGroups.first;
final firstGroupName = firstGroup.name;
return selectedMap[firstGroupName] ?? firstGroup.now;
}
int? getDelay(String? proxyName) {
return _delayMap[getRealProxyName(proxyName)];
} }
VersionInfo? get versionInfo => _versionInfo; VersionInfo? get versionInfo => _versionInfo;
@@ -132,60 +179,107 @@ class AppState with ChangeNotifier {
} }
} }
List<Package> get packages => _packages;
set packages(List<Package> value) {
if (_packages != value) {
_packages = value;
notifyListeners();
}
}
List<Group> get groups => _groups; List<Group> get groups => _groups;
set groups(List<Group> value) { set groups(List<Group> value) {
if (_groups != value) { if (!const ListEquality<Group>().equals(_groups, value)) {
_groups = value; _groups = value;
notifyListeners(); notifyListeners();
} }
} }
List<Group> getCurrentGroups(Mode mode) { num get sortNum => _sortNum;
set sortNum(num value) {
if (_sortNum != value) {
_sortNum = value;
notifyListeners();
}
}
Mode get mode => _mode;
set mode(Mode value) {
if (_mode != value) {
_mode = value;
notifyListeners();
}
}
bool get isCompatible {
return _isCompatible;
}
set isCompatible(bool value) {
if (_isCompatible != value) {
_isCompatible = value;
notifyListeners();
}
}
SelectedMap get selectedMap {
return _selectedMap;
}
set selectedMap(SelectedMap value) {
if (!const MapEquality<String, String>().equals(_selectedMap, value)) {
_selectedMap = value;
notifyListeners();
}
}
List<Group> get currentGroups {
switch (mode) { switch (mode) {
case Mode.direct: case Mode.direct:
return []; return [];
case Mode.global: case Mode.global:
return groups return groups
.where((element) => element.name == UsedProxy.GLOBAL.name) .where((element) => element.name == GroupName.GLOBAL.name)
.toList(); .toList();
case Mode.rule: case Mode.rule:
return groups return groups
.where((element) => element.name != UsedProxy.GLOBAL.name) .where((element) => element.name != GroupName.GLOBAL.name)
.toList(); .toList();
} }
} }
String? getCurrentGroupName(String? groupName, Mode mode) { double get viewWidth => _viewWidth;
final currentGroups = getCurrentGroups(mode);
switch (mode) { set viewWidth(double value) {
case Mode.direct: if (_viewWidth != value) {
return null; _viewWidth = value;
case Mode.global: notifyListeners();
return UsedProxy.GLOBAL.name;
case Mode.rule:
return groupName ??
(currentGroups.isNotEmpty ? currentGroups.first.name : null);
} }
} }
String? getCurrentProxyName(String? proxyName, Mode mode) { ViewMode get viewMode {
final currentGroups = getCurrentGroups(mode); if (_viewWidth <= maxMobileWidth) return ViewMode.mobile;
switch (mode) { if (_viewWidth <= maxLaptopWidth) return ViewMode.laptop;
case Mode.direct: return ViewMode.desktop;
return UsedProxy.DIRECT.name; }
case Mode.global || Mode.rule:
return proxyName ?? DelayMap get delayMap {
(currentGroups.isNotEmpty ? currentGroups.first.now : null); return _delayMap;
}
set delayMap(DelayMap value) {
if (!const MapEquality<String, int?>().equals(_delayMap, value)) {
_delayMap = value;
notifyListeners();
} }
} }
setDelay(Delay delay) {
if (_delayMap[delay.name] != delay.value) {
_delayMap = Map.from(_delayMap)..[delay.name] = delay.value;
notifyListeners();
}
}
Group? getGroupWithName(String groupName) {
final index =
currentGroups.indexWhere((element) => element.name == groupName);
return index != -1 ? currentGroups[index] : null;
}
} }

View File

@@ -1,37 +1,26 @@
// ignore_for_file: invalid_annotation_target
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/common/constant.dart'; import 'package:fl_clash/common/constant.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:freezed_annotation/freezed_annotation.dart';
import '../enum/enum.dart'; import '../enum/enum.dart';
part 'generated/clash_config.g.dart'; part 'generated/clash_config.g.dart';
@JsonSerializable() part 'generated/clash_config.freezed.dart';
class Tun {
bool enable;
String device;
TunStack stack;
@JsonKey(name: "dns-hijack")
List<String> dnsHijack;
Tun() : enable = false, @freezed
stack = TunStack.gvisor, class Tun with _$Tun {
dnsHijack = ["any:53"], const factory Tun({
device = appConstant.name; @Default(false) bool enable,
@Default(appName) String device,
@Default(TunStack.gvisor) TunStack stack,
@JsonKey(name: "dns-hijack") @Default(["any:53"]) List<String> dnsHijack,
}) = _Tun;
factory Tun.fromJson(Map<String, dynamic> json) { factory Tun.fromJson(Map<String, Object?> json) => _$TunFromJson(json);
return _$TunFromJson(json);
}
Map<String, dynamic> toJson() {
return _$TunToJson(this);
}
// Tun copyWith({bool? enable, int? fileDescriptor}) {
// return Tun(
// enable: enable ?? this.enable,
// );
// }
} }
@JsonSerializable() @JsonSerializable()
@@ -137,7 +126,7 @@ class ClashConfig extends ChangeNotifier {
_mode = mode ?? Mode.rule, _mode = mode ?? Mode.rule,
_allowLan = allowLan ?? false, _allowLan = allowLan ?? false,
_logLevel = logLevel ?? LogLevel.info, _logLevel = logLevel ?? LogLevel.info,
_tun = tun ?? Tun(), _tun = tun ?? const Tun(),
_dns = dns ?? Dns(), _dns = dns ?? Dns(),
_rules = rules ?? []; _rules = rules ?? [];
@@ -207,6 +196,19 @@ class ClashConfig extends ChangeNotifier {
} }
} }
update([ClashConfig? clashConfig]) {
if (clashConfig != null) {
_mixedPort = clashConfig._mixedPort;
_allowLan = clashConfig._allowLan;
_mode = clashConfig._mode;
_logLevel = clashConfig._logLevel;
_tun = clashConfig._tun;
_dns = clashConfig._dns;
_rules = clashConfig._rules;
}
notifyListeners();
}
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
return _$ClashConfigToJson(this); return _$ClashConfigToJson(this);
} }
@@ -225,4 +227,9 @@ class ClashConfig extends ChangeNotifier {
allowLan: allowLan, allowLan: allowLan,
); );
} }
@override
String toString() {
return 'ClashConfig{_mixedPort: $_mixedPort, _allowLan: $_allowLan, _mode: $_mode, _logLevel: $_logLevel, _tun: $_tun, _dns: $_dns, _rules: $_rules}';
}
} }

View File

@@ -11,14 +11,10 @@ class Result<T> {
this.data, this.data,
}); });
Result.success({ Result.success([this.data]) : type = ResultType.success,
this.data,
}) : type = ResultType.success,
message = null; message = null;
Result.error({ Result.error([this.message]) : type = ResultType.error,
this.message,
}) : type = ResultType.error,
data = null; data = null;
@override @override

View File

@@ -1,66 +1,32 @@
import 'dart:io'; import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:freezed_annotation/freezed_annotation.dart';
import '../enum/enum.dart'; import '../enum/enum.dart';
import '../common/common.dart'; import '../common/common.dart';
import 'models.dart'; import 'models.dart';
part 'generated/config.g.dart'; part 'generated/config.g.dart';
part 'generated/config.freezed.dart';
@JsonSerializable() @freezed
class AccessControl { class AccessControl with _$AccessControl {
AccessControlMode mode; const factory AccessControl({
List<String> acceptList; @Default(AccessControlMode.rejectSelected) AccessControlMode mode,
List<String> rejectList; @Default([]) List<String> acceptList,
bool isFilterSystemApp; @Default([]) List<String> rejectList,
@Default(true) bool isFilterSystemApp,
}) = _AccessControl;
AccessControl({ factory AccessControl.fromJson(Map<String, Object?> json) =>
this.isFilterSystemApp = true, _$AccessControlFromJson(json);
this.mode = AccessControlMode.rejectSelected,
this.acceptList = const [],
this.rejectList = const [],
});
@JsonKey(includeFromJson: false, includeToJson: false)
List<String> get currentList =>
mode == AccessControlMode.acceptSelected ? acceptList : rejectList;
set currentList(List<String> currentList) {
if (mode == AccessControlMode.acceptSelected) {
acceptList = currentList;
} else {
rejectList = currentList;
}
}
AccessControl copyWith({
AccessControlMode? mode,
List<String>? acceptList,
List<String>? rejectList,
bool? isFilterSystemApp,
}) {
return AccessControl(
mode: mode ?? this.mode,
acceptList: acceptList ?? this.acceptList,
rejectList: rejectList ?? this.rejectList,
isFilterSystemApp: isFilterSystemApp ?? this.isFilterSystemApp,
);
}
Map<String, dynamic> toJson() {
return _$AccessControlToJson(this);
}
factory AccessControl.fromJson(Map<String, dynamic> json) {
return _$AccessControlFromJson(json);
}
} }
@JsonSerializable() @JsonSerializable()
class Config extends ChangeNotifier { class Config extends ChangeNotifier {
List<Profile> _profiles; List<Profile> _profiles;
bool _isCompatible;
String? _currentProfileId; String? _currentProfileId;
bool _autoLaunch; bool _autoLaunch;
bool _silentLaunch; bool _silentLaunch;
@@ -74,6 +40,8 @@ class Config extends ChangeNotifier {
bool _isAccessControl; bool _isAccessControl;
AccessControl _accessControl; AccessControl _accessControl;
bool _isAnimateToPage; bool _isAnimateToPage;
bool _autoCheckUpdate;
DAV? _dav;
Config() Config()
: _profiles = [], : _profiles = [],
@@ -82,12 +50,14 @@ class Config extends ChangeNotifier {
_autoRun = false, _autoRun = false,
_themeMode = ThemeMode.system, _themeMode = ThemeMode.system,
_openLog = false, _openLog = false,
_primaryColor = appConstant.defaultPrimaryColor.value, _isCompatible = false,
_primaryColor = defaultPrimaryColor.value,
_proxiesSortType = ProxiesSortType.none, _proxiesSortType = ProxiesSortType.none,
_isMinimizeOnExit = true, _isMinimizeOnExit = true,
_isAccessControl = false, _isAccessControl = false,
_accessControl = AccessControl(), _autoCheckUpdate = true,
_isAnimateToPage = false; _accessControl = const AccessControl(),
_isAnimateToPage = true;
deleteProfileById(String id) { deleteProfileById(String id) {
_profiles = profiles.where((element) => element.id != id).toList(); _profiles = profiles.where((element) => element.id != id).toList();
@@ -106,20 +76,21 @@ class Config extends ChangeNotifier {
} }
String? _getLabel(String? label, String id) { String? _getLabel(String? label, String id) {
final realLabel = label ?? id;
final hasDup = _profiles.indexWhere( final hasDup = _profiles.indexWhere(
(element) => element.label == label && element.id != id) != (element) => element.label == realLabel && element.id != id) !=
-1; -1;
if (hasDup) { if (hasDup) {
return _getLabel(Other.getOverwriteLabel(label!), id); return _getLabel(other.getOverwriteLabel(realLabel), id);
} else { } else {
return label; return label;
} }
} }
setProfile(Profile profile) { _setProfile(Profile profile) {
final List<Profile> profilesTemp = List.from(_profiles); final List<Profile> profilesTemp = List.from(_profiles);
final index = final index =
profilesTemp.indexWhere((element) => element.id == profile.id); profilesTemp.indexWhere((element) => element.id == profile.id);
final updateProfile = profile.copyWith( final updateProfile = profile.copyWith(
label: _getLabel(profile.label, profile.id), label: _getLabel(profile.label, profile.id),
); );
@@ -129,6 +100,10 @@ class Config extends ChangeNotifier {
profilesTemp[index] = updateProfile; profilesTemp[index] = updateProfile;
} }
_profiles = profilesTemp; _profiles = profilesTemp;
}
setProfile(Profile profile) {
_setProfile(profile);
notifyListeners(); notifyListeners();
} }
@@ -159,9 +134,17 @@ class Config extends ChangeNotifier {
} }
} }
String? get currentProxyName => currentProfile?.proxyName; SelectedMap get currentSelectedMap {
return currentProfile?.selectedMap ?? {};
}
String? get currentGroupName => currentProfile?.groupName; updateCurrentSelectedMap(String groupName, String proxyName) {
if (currentProfile?.selectedMap[groupName] != proxyName) {
currentProfile?.selectedMap = Map.from(currentProfile?.selectedMap ?? {})
..[groupName] = proxyName;
notifyListeners();
}
}
@JsonKey(defaultValue: false) @JsonKey(defaultValue: false)
bool get autoLaunch { bool get autoLaunch {
@@ -269,9 +252,18 @@ class Config extends ChangeNotifier {
AccessControl get accessControl => _accessControl; AccessControl get accessControl => _accessControl;
set accessControl(AccessControl? value) { set accessControl(AccessControl value) {
if (_accessControl != value) { if (_accessControl != value) {
_accessControl = value ?? AccessControl(); _accessControl = value;
notifyListeners();
}
}
DAV? get dav => _dav;
set dav(DAV? value) {
if (_dav != value) {
_dav = value;
notifyListeners(); notifyListeners();
} }
} }
@@ -289,7 +281,59 @@ class Config extends ChangeNotifier {
} }
} }
update() { @JsonKey(defaultValue: false)
bool get isCompatible {
return _isCompatible;
}
set isCompatible(bool value) {
if (_isCompatible != value) {
_isCompatible = value;
notifyListeners();
}
}
@JsonKey(defaultValue: true)
bool get autoCheckUpdate {
return _autoCheckUpdate;
}
set autoCheckUpdate(bool value) {
if (_autoCheckUpdate != value) {
_autoCheckUpdate = value;
notifyListeners();
}
}
update(
[Config? config, RecoveryOption recoveryOptions = RecoveryOption.all]) {
if (config != null) {
_profiles = config._profiles;
for (final profile in config._profiles) {
_setProfile(profile);
}
final onlyProfiles = recoveryOptions == RecoveryOption.onlyProfiles;
if (_currentProfileId == null && onlyProfiles && profiles.isNotEmpty) {
_currentProfileId = _profiles.first.id;
}
if (onlyProfiles) return;
_currentProfileId = config._currentProfileId;
_isCompatible = config._isCompatible;
_autoLaunch = config._autoLaunch;
_silentLaunch = config._silentLaunch;
_autoRun = config._autoRun;
_openLog = config._openLog;
_themeMode = config._themeMode;
_locale = config._locale;
_primaryColor = config._primaryColor;
_proxiesSortType = config._proxiesSortType;
_isMinimizeOnExit = config._isMinimizeOnExit;
_isAccessControl = config._isAccessControl;
_accessControl = config._accessControl;
_isAnimateToPage = config._isAnimateToPage;
_autoCheckUpdate = config._autoCheckUpdate;
_dav = config._dav;
}
notifyListeners(); notifyListeners();
} }
@@ -300,4 +344,9 @@ class Config extends ChangeNotifier {
factory Config.fromJson(Map<String, dynamic> json) { factory Config.fromJson(Map<String, dynamic> json) {
return _$ConfigFromJson(json); return _$ConfigFromJson(json);
} }
@override
String toString() {
return 'Config{_profiles: $_profiles, _isCompatible: $_isCompatible, _currentProfileId: $_currentProfileId, _autoLaunch: $_autoLaunch, _silentLaunch: $_silentLaunch, _autoRun: $_autoRun, _openLog: $_openLog, _themeMode: $_themeMode, _locale: $_locale, _primaryColor: $_primaryColor, _proxiesSortType: $_proxiesSortType, _isMinimizeOnExit: $_isMinimizeOnExit, _isAccessControl: $_isAccessControl, _accessControl: $_accessControl, _isAnimateToPage: $_isAnimateToPage, _dav: $_dav}';
}
} }

17
lib/models/dav.dart Normal file
View File

@@ -0,0 +1,17 @@
import 'package:freezed_annotation/freezed_annotation.dart';
part 'generated/dav.g.dart';
part 'generated/dav.freezed.dart';
@freezed
class DAV with _$DAV{
const factory DAV({
required String uri,
required String user,
required String password,
}) = _DAV;
factory DAV.fromJson(Map<String, Object?> json) =>
_$DAVFromJson(json);
}

View File

@@ -13,7 +13,8 @@ class UpdateConfigParams with _$UpdateConfigParams {
const factory UpdateConfigParams({ const factory UpdateConfigParams({
@JsonKey(name: "profile-path") String? profilePath, @JsonKey(name: "profile-path") String? profilePath,
required ClashConfig config, required ClashConfig config,
@JsonKey(name: "is-patch") bool? isPatch, @JsonKey(name: "is-patch") required bool isPatch,
@JsonKey(name: "is-compatible") required bool isCompatible,
}) = _UpdateConfigParams; }) = _UpdateConfigParams;
factory UpdateConfigParams.fromJson(Map<String, Object?> json) => factory UpdateConfigParams.fromJson(Map<String, Object?> json) =>
@@ -52,6 +53,16 @@ class Delay with _$Delay {
factory Delay.fromJson(Map<String, Object?> json) => _$DelayFromJson(json); factory Delay.fromJson(Map<String, Object?> json) => _$DelayFromJson(json);
} }
@freezed
class Now with _$Now {
const factory Now({
required String name,
required String value,
}) = _Now;
factory Now.fromJson(Map<String, Object?> json) => _$NowFromJson(json);
}
@freezed @freezed
class Process with _$Process { class Process with _$Process {
const factory Process({ const factory Process({

View File

@@ -0,0 +1,222 @@
// coverage:ignore-file
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint
// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
part of '../clash_config.dart';
// **************************************************************************
// FreezedGenerator
// **************************************************************************
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
Tun _$TunFromJson(Map<String, dynamic> json) {
return _Tun.fromJson(json);
}
/// @nodoc
mixin _$Tun {
bool get enable => throw _privateConstructorUsedError;
String get device => throw _privateConstructorUsedError;
TunStack get stack => throw _privateConstructorUsedError;
@JsonKey(name: "dns-hijack")
List<String> get dnsHijack => throw _privateConstructorUsedError;
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$TunCopyWith<Tun> get copyWith => throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $TunCopyWith<$Res> {
factory $TunCopyWith(Tun value, $Res Function(Tun) then) =
_$TunCopyWithImpl<$Res, Tun>;
@useResult
$Res call(
{bool enable,
String device,
TunStack stack,
@JsonKey(name: "dns-hijack") List<String> dnsHijack});
}
/// @nodoc
class _$TunCopyWithImpl<$Res, $Val extends Tun> implements $TunCopyWith<$Res> {
_$TunCopyWithImpl(this._value, this._then);
// ignore: unused_field
final $Val _value;
// ignore: unused_field
final $Res Function($Val) _then;
@pragma('vm:prefer-inline')
@override
$Res call({
Object? enable = null,
Object? device = null,
Object? stack = null,
Object? dnsHijack = null,
}) {
return _then(_value.copyWith(
enable: null == enable
? _value.enable
: enable // ignore: cast_nullable_to_non_nullable
as bool,
device: null == device
? _value.device
: device // ignore: cast_nullable_to_non_nullable
as String,
stack: null == stack
? _value.stack
: stack // ignore: cast_nullable_to_non_nullable
as TunStack,
dnsHijack: null == dnsHijack
? _value.dnsHijack
: dnsHijack // ignore: cast_nullable_to_non_nullable
as List<String>,
) as $Val);
}
}
/// @nodoc
abstract class _$$TunImplCopyWith<$Res> implements $TunCopyWith<$Res> {
factory _$$TunImplCopyWith(_$TunImpl value, $Res Function(_$TunImpl) then) =
__$$TunImplCopyWithImpl<$Res>;
@override
@useResult
$Res call(
{bool enable,
String device,
TunStack stack,
@JsonKey(name: "dns-hijack") List<String> dnsHijack});
}
/// @nodoc
class __$$TunImplCopyWithImpl<$Res> extends _$TunCopyWithImpl<$Res, _$TunImpl>
implements _$$TunImplCopyWith<$Res> {
__$$TunImplCopyWithImpl(_$TunImpl _value, $Res Function(_$TunImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@override
$Res call({
Object? enable = null,
Object? device = null,
Object? stack = null,
Object? dnsHijack = null,
}) {
return _then(_$TunImpl(
enable: null == enable
? _value.enable
: enable // ignore: cast_nullable_to_non_nullable
as bool,
device: null == device
? _value.device
: device // ignore: cast_nullable_to_non_nullable
as String,
stack: null == stack
? _value.stack
: stack // ignore: cast_nullable_to_non_nullable
as TunStack,
dnsHijack: null == dnsHijack
? _value._dnsHijack
: dnsHijack // ignore: cast_nullable_to_non_nullable
as List<String>,
));
}
}
/// @nodoc
@JsonSerializable()
class _$TunImpl implements _Tun {
const _$TunImpl(
{this.enable = false,
this.device = appName,
this.stack = TunStack.gvisor,
@JsonKey(name: "dns-hijack")
final List<String> dnsHijack = const ["any:53"]})
: _dnsHijack = dnsHijack;
factory _$TunImpl.fromJson(Map<String, dynamic> json) =>
_$$TunImplFromJson(json);
@override
@JsonKey()
final bool enable;
@override
@JsonKey()
final String device;
@override
@JsonKey()
final TunStack stack;
final List<String> _dnsHijack;
@override
@JsonKey(name: "dns-hijack")
List<String> get dnsHijack {
if (_dnsHijack is EqualUnmodifiableListView) return _dnsHijack;
// ignore: implicit_dynamic_type
return EqualUnmodifiableListView(_dnsHijack);
}
@override
String toString() {
return 'Tun(enable: $enable, device: $device, stack: $stack, dnsHijack: $dnsHijack)';
}
@override
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$TunImpl &&
(identical(other.enable, enable) || other.enable == enable) &&
(identical(other.device, device) || other.device == device) &&
(identical(other.stack, stack) || other.stack == stack) &&
const DeepCollectionEquality()
.equals(other._dnsHijack, _dnsHijack));
}
@JsonKey(ignore: true)
@override
int get hashCode => Object.hash(runtimeType, enable, device, stack,
const DeepCollectionEquality().hash(_dnsHijack));
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$TunImplCopyWith<_$TunImpl> get copyWith =>
__$$TunImplCopyWithImpl<_$TunImpl>(this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$TunImplToJson(
this,
);
}
}
abstract class _Tun implements Tun {
const factory _Tun(
{final bool enable,
final String device,
final TunStack stack,
@JsonKey(name: "dns-hijack") final List<String> dnsHijack}) = _$TunImpl;
factory _Tun.fromJson(Map<String, dynamic> json) = _$TunImpl.fromJson;
@override
bool get enable;
@override
String get device;
@override
TunStack get stack;
@override
@JsonKey(name: "dns-hijack")
List<String> get dnsHijack;
@override
@JsonKey(ignore: true)
_$$TunImplCopyWith<_$TunImpl> get copyWith =>
throw _privateConstructorUsedError;
}

View File

@@ -6,26 +6,6 @@ part of '../clash_config.dart';
// JsonSerializableGenerator // JsonSerializableGenerator
// ************************************************************************** // **************************************************************************
Tun _$TunFromJson(Map<String, dynamic> json) => Tun()
..enable = json['enable'] as bool
..device = json['device'] as String
..stack = $enumDecode(_$TunStackEnumMap, json['stack'])
..dnsHijack =
(json['dns-hijack'] as List<dynamic>).map((e) => e as String).toList();
Map<String, dynamic> _$TunToJson(Tun instance) => <String, dynamic>{
'enable': instance.enable,
'device': instance.device,
'stack': _$TunStackEnumMap[instance.stack]!,
'dns-hijack': instance.dnsHijack,
};
const _$TunStackEnumMap = {
TunStack.gvisor: 'gvisor',
TunStack.system: 'system',
TunStack.mixed: 'mixed',
};
Dns _$DnsFromJson(Map<String, dynamic> json) => Dns() Dns _$DnsFromJson(Map<String, dynamic> json) => Dns()
..enable = json['enable'] as bool ..enable = json['enable'] as bool
..ipv6 = json['ipv6'] as bool ..ipv6 = json['ipv6'] as bool
@@ -94,3 +74,27 @@ const _$LogLevelEnumMap = {
LogLevel.error: 'error', LogLevel.error: 'error',
LogLevel.silent: 'silent', LogLevel.silent: 'silent',
}; };
_$TunImpl _$$TunImplFromJson(Map<String, dynamic> json) => _$TunImpl(
enable: json['enable'] as bool? ?? false,
device: json['device'] as String? ?? appName,
stack: $enumDecodeNullable(_$TunStackEnumMap, json['stack']) ??
TunStack.gvisor,
dnsHijack: (json['dns-hijack'] as List<dynamic>?)
?.map((e) => e as String)
.toList() ??
const ["any:53"],
);
Map<String, dynamic> _$$TunImplToJson(_$TunImpl instance) => <String, dynamic>{
'enable': instance.enable,
'device': instance.device,
'stack': _$TunStackEnumMap[instance.stack]!,
'dns-hijack': instance.dnsHijack,
};
const _$TunStackEnumMap = {
TunStack.gvisor: 'gvisor',
TunStack.system: 'system',
TunStack.mixed: 'mixed',
};

View File

@@ -0,0 +1,241 @@
// coverage:ignore-file
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint
// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
part of '../config.dart';
// **************************************************************************
// FreezedGenerator
// **************************************************************************
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
AccessControl _$AccessControlFromJson(Map<String, dynamic> json) {
return _AccessControl.fromJson(json);
}
/// @nodoc
mixin _$AccessControl {
AccessControlMode get mode => throw _privateConstructorUsedError;
List<String> get acceptList => throw _privateConstructorUsedError;
List<String> get rejectList => throw _privateConstructorUsedError;
bool get isFilterSystemApp => throw _privateConstructorUsedError;
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$AccessControlCopyWith<AccessControl> get copyWith =>
throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $AccessControlCopyWith<$Res> {
factory $AccessControlCopyWith(
AccessControl value, $Res Function(AccessControl) then) =
_$AccessControlCopyWithImpl<$Res, AccessControl>;
@useResult
$Res call(
{AccessControlMode mode,
List<String> acceptList,
List<String> rejectList,
bool isFilterSystemApp});
}
/// @nodoc
class _$AccessControlCopyWithImpl<$Res, $Val extends AccessControl>
implements $AccessControlCopyWith<$Res> {
_$AccessControlCopyWithImpl(this._value, this._then);
// ignore: unused_field
final $Val _value;
// ignore: unused_field
final $Res Function($Val) _then;
@pragma('vm:prefer-inline')
@override
$Res call({
Object? mode = null,
Object? acceptList = null,
Object? rejectList = null,
Object? isFilterSystemApp = null,
}) {
return _then(_value.copyWith(
mode: null == mode
? _value.mode
: mode // ignore: cast_nullable_to_non_nullable
as AccessControlMode,
acceptList: null == acceptList
? _value.acceptList
: acceptList // ignore: cast_nullable_to_non_nullable
as List<String>,
rejectList: null == rejectList
? _value.rejectList
: rejectList // ignore: cast_nullable_to_non_nullable
as List<String>,
isFilterSystemApp: null == isFilterSystemApp
? _value.isFilterSystemApp
: isFilterSystemApp // ignore: cast_nullable_to_non_nullable
as bool,
) as $Val);
}
}
/// @nodoc
abstract class _$$AccessControlImplCopyWith<$Res>
implements $AccessControlCopyWith<$Res> {
factory _$$AccessControlImplCopyWith(
_$AccessControlImpl value, $Res Function(_$AccessControlImpl) then) =
__$$AccessControlImplCopyWithImpl<$Res>;
@override
@useResult
$Res call(
{AccessControlMode mode,
List<String> acceptList,
List<String> rejectList,
bool isFilterSystemApp});
}
/// @nodoc
class __$$AccessControlImplCopyWithImpl<$Res>
extends _$AccessControlCopyWithImpl<$Res, _$AccessControlImpl>
implements _$$AccessControlImplCopyWith<$Res> {
__$$AccessControlImplCopyWithImpl(
_$AccessControlImpl _value, $Res Function(_$AccessControlImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@override
$Res call({
Object? mode = null,
Object? acceptList = null,
Object? rejectList = null,
Object? isFilterSystemApp = null,
}) {
return _then(_$AccessControlImpl(
mode: null == mode
? _value.mode
: mode // ignore: cast_nullable_to_non_nullable
as AccessControlMode,
acceptList: null == acceptList
? _value._acceptList
: acceptList // ignore: cast_nullable_to_non_nullable
as List<String>,
rejectList: null == rejectList
? _value._rejectList
: rejectList // ignore: cast_nullable_to_non_nullable
as List<String>,
isFilterSystemApp: null == isFilterSystemApp
? _value.isFilterSystemApp
: isFilterSystemApp // ignore: cast_nullable_to_non_nullable
as bool,
));
}
}
/// @nodoc
@JsonSerializable()
class _$AccessControlImpl implements _AccessControl {
const _$AccessControlImpl(
{this.mode = AccessControlMode.rejectSelected,
final List<String> acceptList = const [],
final List<String> rejectList = const [],
this.isFilterSystemApp = true})
: _acceptList = acceptList,
_rejectList = rejectList;
factory _$AccessControlImpl.fromJson(Map<String, dynamic> json) =>
_$$AccessControlImplFromJson(json);
@override
@JsonKey()
final AccessControlMode mode;
final List<String> _acceptList;
@override
@JsonKey()
List<String> get acceptList {
if (_acceptList is EqualUnmodifiableListView) return _acceptList;
// ignore: implicit_dynamic_type
return EqualUnmodifiableListView(_acceptList);
}
final List<String> _rejectList;
@override
@JsonKey()
List<String> get rejectList {
if (_rejectList is EqualUnmodifiableListView) return _rejectList;
// ignore: implicit_dynamic_type
return EqualUnmodifiableListView(_rejectList);
}
@override
@JsonKey()
final bool isFilterSystemApp;
@override
String toString() {
return 'AccessControl(mode: $mode, acceptList: $acceptList, rejectList: $rejectList, isFilterSystemApp: $isFilterSystemApp)';
}
@override
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$AccessControlImpl &&
(identical(other.mode, mode) || other.mode == mode) &&
const DeepCollectionEquality()
.equals(other._acceptList, _acceptList) &&
const DeepCollectionEquality()
.equals(other._rejectList, _rejectList) &&
(identical(other.isFilterSystemApp, isFilterSystemApp) ||
other.isFilterSystemApp == isFilterSystemApp));
}
@JsonKey(ignore: true)
@override
int get hashCode => Object.hash(
runtimeType,
mode,
const DeepCollectionEquality().hash(_acceptList),
const DeepCollectionEquality().hash(_rejectList),
isFilterSystemApp);
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$AccessControlImplCopyWith<_$AccessControlImpl> get copyWith =>
__$$AccessControlImplCopyWithImpl<_$AccessControlImpl>(this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$AccessControlImplToJson(
this,
);
}
}
abstract class _AccessControl implements AccessControl {
const factory _AccessControl(
{final AccessControlMode mode,
final List<String> acceptList,
final List<String> rejectList,
final bool isFilterSystemApp}) = _$AccessControlImpl;
factory _AccessControl.fromJson(Map<String, dynamic> json) =
_$AccessControlImpl.fromJson;
@override
AccessControlMode get mode;
@override
List<String> get acceptList;
@override
List<String> get rejectList;
@override
bool get isFilterSystemApp;
@override
@JsonKey(ignore: true)
_$$AccessControlImplCopyWith<_$AccessControlImpl> get copyWith =>
throw _privateConstructorUsedError;
}

View File

@@ -6,34 +6,6 @@ part of '../config.dart';
// JsonSerializableGenerator // JsonSerializableGenerator
// ************************************************************************** // **************************************************************************
AccessControl _$AccessControlFromJson(Map<String, dynamic> json) =>
AccessControl(
isFilterSystemApp: json['isFilterSystemApp'] as bool? ?? true,
mode: $enumDecodeNullable(_$AccessControlModeEnumMap, json['mode']) ??
AccessControlMode.rejectSelected,
acceptList: (json['acceptList'] as List<dynamic>?)
?.map((e) => e as String)
.toList() ??
const [],
rejectList: (json['rejectList'] as List<dynamic>?)
?.map((e) => e as String)
.toList() ??
const [],
);
Map<String, dynamic> _$AccessControlToJson(AccessControl instance) =>
<String, dynamic>{
'mode': _$AccessControlModeEnumMap[instance.mode]!,
'acceptList': instance.acceptList,
'rejectList': instance.rejectList,
'isFilterSystemApp': instance.isFilterSystemApp,
};
const _$AccessControlModeEnumMap = {
AccessControlMode.acceptSelected: 'acceptSelected',
AccessControlMode.rejectSelected: 'rejectSelected',
};
Config _$ConfigFromJson(Map<String, dynamic> json) => Config() Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
..profiles = (json['profiles'] as List<dynamic>?) ..profiles = (json['profiles'] as List<dynamic>?)
?.map((e) => Profile.fromJson(e as Map<String, dynamic>)) ?.map((e) => Profile.fromJson(e as Map<String, dynamic>))
@@ -55,7 +27,12 @@ Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
..isAccessControl = json['isAccessControl'] as bool? ?? false ..isAccessControl = json['isAccessControl'] as bool? ?? false
..accessControl = ..accessControl =
AccessControl.fromJson(json['accessControl'] as Map<String, dynamic>) AccessControl.fromJson(json['accessControl'] as Map<String, dynamic>)
..isAnimateToPage = json['isAnimateToPage'] as bool? ?? true; ..dav = json['dav'] == null
? null
: DAV.fromJson(json['dav'] as Map<String, dynamic>)
..isAnimateToPage = json['isAnimateToPage'] as bool? ?? true
..isCompatible = json['isCompatible'] as bool? ?? false
..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true;
Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{ Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
'profiles': instance.profiles, 'profiles': instance.profiles,
@@ -71,7 +48,10 @@ Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
'isMinimizeOnExit': instance.isMinimizeOnExit, 'isMinimizeOnExit': instance.isMinimizeOnExit,
'isAccessControl': instance.isAccessControl, 'isAccessControl': instance.isAccessControl,
'accessControl': instance.accessControl, 'accessControl': instance.accessControl,
'dav': instance.dav,
'isAnimateToPage': instance.isAnimateToPage, 'isAnimateToPage': instance.isAnimateToPage,
'isCompatible': instance.isCompatible,
'autoCheckUpdate': instance.autoCheckUpdate,
}; };
const _$ThemeModeEnumMap = { const _$ThemeModeEnumMap = {
@@ -85,3 +65,31 @@ const _$ProxiesSortTypeEnumMap = {
ProxiesSortType.delay: 'delay', ProxiesSortType.delay: 'delay',
ProxiesSortType.name: 'name', ProxiesSortType.name: 'name',
}; };
_$AccessControlImpl _$$AccessControlImplFromJson(Map<String, dynamic> json) =>
_$AccessControlImpl(
mode: $enumDecodeNullable(_$AccessControlModeEnumMap, json['mode']) ??
AccessControlMode.rejectSelected,
acceptList: (json['acceptList'] as List<dynamic>?)
?.map((e) => e as String)
.toList() ??
const [],
rejectList: (json['rejectList'] as List<dynamic>?)
?.map((e) => e as String)
.toList() ??
const [],
isFilterSystemApp: json['isFilterSystemApp'] as bool? ?? true,
);
Map<String, dynamic> _$$AccessControlImplToJson(_$AccessControlImpl instance) =>
<String, dynamic>{
'mode': _$AccessControlModeEnumMap[instance.mode]!,
'acceptList': instance.acceptList,
'rejectList': instance.rejectList,
'isFilterSystemApp': instance.isFilterSystemApp,
};
const _$AccessControlModeEnumMap = {
AccessControlMode.acceptSelected: 'acceptSelected',
AccessControlMode.rejectSelected: 'rejectSelected',
};

View File

@@ -0,0 +1,180 @@
// coverage:ignore-file
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint
// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
part of '../dav.dart';
// **************************************************************************
// FreezedGenerator
// **************************************************************************
T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
DAV _$DAVFromJson(Map<String, dynamic> json) {
return _DAV.fromJson(json);
}
/// @nodoc
mixin _$DAV {
String get uri => throw _privateConstructorUsedError;
String get user => throw _privateConstructorUsedError;
String get password => throw _privateConstructorUsedError;
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$DAVCopyWith<DAV> get copyWith => throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $DAVCopyWith<$Res> {
factory $DAVCopyWith(DAV value, $Res Function(DAV) then) =
_$DAVCopyWithImpl<$Res, DAV>;
@useResult
$Res call({String uri, String user, String password});
}
/// @nodoc
class _$DAVCopyWithImpl<$Res, $Val extends DAV> implements $DAVCopyWith<$Res> {
_$DAVCopyWithImpl(this._value, this._then);
// ignore: unused_field
final $Val _value;
// ignore: unused_field
final $Res Function($Val) _then;
@pragma('vm:prefer-inline')
@override
$Res call({
Object? uri = null,
Object? user = null,
Object? password = null,
}) {
return _then(_value.copyWith(
uri: null == uri
? _value.uri
: uri // ignore: cast_nullable_to_non_nullable
as String,
user: null == user
? _value.user
: user // ignore: cast_nullable_to_non_nullable
as String,
password: null == password
? _value.password
: password // ignore: cast_nullable_to_non_nullable
as String,
) as $Val);
}
}
/// @nodoc
abstract class _$$DAVImplCopyWith<$Res> implements $DAVCopyWith<$Res> {
factory _$$DAVImplCopyWith(_$DAVImpl value, $Res Function(_$DAVImpl) then) =
__$$DAVImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String uri, String user, String password});
}
/// @nodoc
class __$$DAVImplCopyWithImpl<$Res> extends _$DAVCopyWithImpl<$Res, _$DAVImpl>
implements _$$DAVImplCopyWith<$Res> {
__$$DAVImplCopyWithImpl(_$DAVImpl _value, $Res Function(_$DAVImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@override
$Res call({
Object? uri = null,
Object? user = null,
Object? password = null,
}) {
return _then(_$DAVImpl(
uri: null == uri
? _value.uri
: uri // ignore: cast_nullable_to_non_nullable
as String,
user: null == user
? _value.user
: user // ignore: cast_nullable_to_non_nullable
as String,
password: null == password
? _value.password
: password // ignore: cast_nullable_to_non_nullable
as String,
));
}
}
/// @nodoc
@JsonSerializable()
class _$DAVImpl implements _DAV {
const _$DAVImpl(
{required this.uri, required this.user, required this.password});
factory _$DAVImpl.fromJson(Map<String, dynamic> json) =>
_$$DAVImplFromJson(json);
@override
final String uri;
@override
final String user;
@override
final String password;
@override
String toString() {
return 'DAV(uri: $uri, user: $user, password: $password)';
}
@override
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$DAVImpl &&
(identical(other.uri, uri) || other.uri == uri) &&
(identical(other.user, user) || other.user == user) &&
(identical(other.password, password) ||
other.password == password));
}
@JsonKey(ignore: true)
@override
int get hashCode => Object.hash(runtimeType, uri, user, password);
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$DAVImplCopyWith<_$DAVImpl> get copyWith =>
__$$DAVImplCopyWithImpl<_$DAVImpl>(this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$DAVImplToJson(
this,
);
}
}
abstract class _DAV implements DAV {
const factory _DAV(
{required final String uri,
required final String user,
required final String password}) = _$DAVImpl;
factory _DAV.fromJson(Map<String, dynamic> json) = _$DAVImpl.fromJson;
@override
String get uri;
@override
String get user;
@override
String get password;
@override
@JsonKey(ignore: true)
_$$DAVImplCopyWith<_$DAVImpl> get copyWith =>
throw _privateConstructorUsedError;
}

View File

@@ -0,0 +1,19 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of '../dav.dart';
// **************************************************************************
// JsonSerializableGenerator
// **************************************************************************
_$DAVImpl _$$DAVImplFromJson(Map<String, dynamic> json) => _$DAVImpl(
uri: json['uri'] as String,
user: json['user'] as String,
password: json['password'] as String,
);
Map<String, dynamic> _$$DAVImplToJson(_$DAVImpl instance) => <String, dynamic>{
'uri': instance.uri,
'user': instance.user,
'password': instance.password,
};

View File

@@ -24,7 +24,9 @@ mixin _$UpdateConfigParams {
String? get profilePath => throw _privateConstructorUsedError; String? get profilePath => throw _privateConstructorUsedError;
ClashConfig get config => throw _privateConstructorUsedError; ClashConfig get config => throw _privateConstructorUsedError;
@JsonKey(name: "is-patch") @JsonKey(name: "is-patch")
bool? get isPatch => throw _privateConstructorUsedError; bool get isPatch => throw _privateConstructorUsedError;
@JsonKey(name: "is-compatible")
bool get isCompatible => throw _privateConstructorUsedError;
Map<String, dynamic> toJson() => throw _privateConstructorUsedError; Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@JsonKey(ignore: true) @JsonKey(ignore: true)
@@ -41,7 +43,8 @@ abstract class $UpdateConfigParamsCopyWith<$Res> {
$Res call( $Res call(
{@JsonKey(name: "profile-path") String? profilePath, {@JsonKey(name: "profile-path") String? profilePath,
ClashConfig config, ClashConfig config,
@JsonKey(name: "is-patch") bool? isPatch}); @JsonKey(name: "is-patch") bool isPatch,
@JsonKey(name: "is-compatible") bool isCompatible});
} }
/// @nodoc /// @nodoc
@@ -59,7 +62,8 @@ class _$UpdateConfigParamsCopyWithImpl<$Res, $Val extends UpdateConfigParams>
$Res call({ $Res call({
Object? profilePath = freezed, Object? profilePath = freezed,
Object? config = null, Object? config = null,
Object? isPatch = freezed, Object? isPatch = null,
Object? isCompatible = null,
}) { }) {
return _then(_value.copyWith( return _then(_value.copyWith(
profilePath: freezed == profilePath profilePath: freezed == profilePath
@@ -70,10 +74,14 @@ class _$UpdateConfigParamsCopyWithImpl<$Res, $Val extends UpdateConfigParams>
? _value.config ? _value.config
: config // ignore: cast_nullable_to_non_nullable : config // ignore: cast_nullable_to_non_nullable
as ClashConfig, as ClashConfig,
isPatch: freezed == isPatch isPatch: null == isPatch
? _value.isPatch ? _value.isPatch
: isPatch // ignore: cast_nullable_to_non_nullable : isPatch // ignore: cast_nullable_to_non_nullable
as bool?, as bool,
isCompatible: null == isCompatible
? _value.isCompatible
: isCompatible // ignore: cast_nullable_to_non_nullable
as bool,
) as $Val); ) as $Val);
} }
} }
@@ -89,7 +97,8 @@ abstract class _$$UpdateConfigParamsImplCopyWith<$Res>
$Res call( $Res call(
{@JsonKey(name: "profile-path") String? profilePath, {@JsonKey(name: "profile-path") String? profilePath,
ClashConfig config, ClashConfig config,
@JsonKey(name: "is-patch") bool? isPatch}); @JsonKey(name: "is-patch") bool isPatch,
@JsonKey(name: "is-compatible") bool isCompatible});
} }
/// @nodoc /// @nodoc
@@ -105,7 +114,8 @@ class __$$UpdateConfigParamsImplCopyWithImpl<$Res>
$Res call({ $Res call({
Object? profilePath = freezed, Object? profilePath = freezed,
Object? config = null, Object? config = null,
Object? isPatch = freezed, Object? isPatch = null,
Object? isCompatible = null,
}) { }) {
return _then(_$UpdateConfigParamsImpl( return _then(_$UpdateConfigParamsImpl(
profilePath: freezed == profilePath profilePath: freezed == profilePath
@@ -116,10 +126,14 @@ class __$$UpdateConfigParamsImplCopyWithImpl<$Res>
? _value.config ? _value.config
: config // ignore: cast_nullable_to_non_nullable : config // ignore: cast_nullable_to_non_nullable
as ClashConfig, as ClashConfig,
isPatch: freezed == isPatch isPatch: null == isPatch
? _value.isPatch ? _value.isPatch
: isPatch // ignore: cast_nullable_to_non_nullable : isPatch // ignore: cast_nullable_to_non_nullable
as bool?, as bool,
isCompatible: null == isCompatible
? _value.isCompatible
: isCompatible // ignore: cast_nullable_to_non_nullable
as bool,
)); ));
} }
} }
@@ -130,7 +144,8 @@ class _$UpdateConfigParamsImpl implements _UpdateConfigParams {
const _$UpdateConfigParamsImpl( const _$UpdateConfigParamsImpl(
{@JsonKey(name: "profile-path") this.profilePath, {@JsonKey(name: "profile-path") this.profilePath,
required this.config, required this.config,
@JsonKey(name: "is-patch") this.isPatch}); @JsonKey(name: "is-patch") required this.isPatch,
@JsonKey(name: "is-compatible") required this.isCompatible});
factory _$UpdateConfigParamsImpl.fromJson(Map<String, dynamic> json) => factory _$UpdateConfigParamsImpl.fromJson(Map<String, dynamic> json) =>
_$$UpdateConfigParamsImplFromJson(json); _$$UpdateConfigParamsImplFromJson(json);
@@ -142,11 +157,14 @@ class _$UpdateConfigParamsImpl implements _UpdateConfigParams {
final ClashConfig config; final ClashConfig config;
@override @override
@JsonKey(name: "is-patch") @JsonKey(name: "is-patch")
final bool? isPatch; final bool isPatch;
@override
@JsonKey(name: "is-compatible")
final bool isCompatible;
@override @override
String toString() { String toString() {
return 'UpdateConfigParams(profilePath: $profilePath, config: $config, isPatch: $isPatch)'; return 'UpdateConfigParams(profilePath: $profilePath, config: $config, isPatch: $isPatch, isCompatible: $isCompatible)';
} }
@override @override
@@ -157,12 +175,15 @@ class _$UpdateConfigParamsImpl implements _UpdateConfigParams {
(identical(other.profilePath, profilePath) || (identical(other.profilePath, profilePath) ||
other.profilePath == profilePath) && other.profilePath == profilePath) &&
(identical(other.config, config) || other.config == config) && (identical(other.config, config) || other.config == config) &&
(identical(other.isPatch, isPatch) || other.isPatch == isPatch)); (identical(other.isPatch, isPatch) || other.isPatch == isPatch) &&
(identical(other.isCompatible, isCompatible) ||
other.isCompatible == isCompatible));
} }
@JsonKey(ignore: true) @JsonKey(ignore: true)
@override @override
int get hashCode => Object.hash(runtimeType, profilePath, config, isPatch); int get hashCode =>
Object.hash(runtimeType, profilePath, config, isPatch, isCompatible);
@JsonKey(ignore: true) @JsonKey(ignore: true)
@override @override
@@ -183,7 +204,8 @@ abstract class _UpdateConfigParams implements UpdateConfigParams {
const factory _UpdateConfigParams( const factory _UpdateConfigParams(
{@JsonKey(name: "profile-path") final String? profilePath, {@JsonKey(name: "profile-path") final String? profilePath,
required final ClashConfig config, required final ClashConfig config,
@JsonKey(name: "is-patch") final bool? isPatch}) = @JsonKey(name: "is-patch") required final bool isPatch,
@JsonKey(name: "is-compatible") required final bool isCompatible}) =
_$UpdateConfigParamsImpl; _$UpdateConfigParamsImpl;
factory _UpdateConfigParams.fromJson(Map<String, dynamic> json) = factory _UpdateConfigParams.fromJson(Map<String, dynamic> json) =
@@ -196,7 +218,10 @@ abstract class _UpdateConfigParams implements UpdateConfigParams {
ClashConfig get config; ClashConfig get config;
@override @override
@JsonKey(name: "is-patch") @JsonKey(name: "is-patch")
bool? get isPatch; bool get isPatch;
@override
@JsonKey(name: "is-compatible")
bool get isCompatible;
@override @override
@JsonKey(ignore: true) @JsonKey(ignore: true)
_$$UpdateConfigParamsImplCopyWith<_$UpdateConfigParamsImpl> get copyWith => _$$UpdateConfigParamsImplCopyWith<_$UpdateConfigParamsImpl> get copyWith =>
@@ -672,6 +697,151 @@ abstract class _Delay implements Delay {
throw _privateConstructorUsedError; throw _privateConstructorUsedError;
} }
Now _$NowFromJson(Map<String, dynamic> json) {
return _Now.fromJson(json);
}
/// @nodoc
mixin _$Now {
String get name => throw _privateConstructorUsedError;
String get value => throw _privateConstructorUsedError;
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
$NowCopyWith<Now> get copyWith => throw _privateConstructorUsedError;
}
/// @nodoc
abstract class $NowCopyWith<$Res> {
factory $NowCopyWith(Now value, $Res Function(Now) then) =
_$NowCopyWithImpl<$Res, Now>;
@useResult
$Res call({String name, String value});
}
/// @nodoc
class _$NowCopyWithImpl<$Res, $Val extends Now> implements $NowCopyWith<$Res> {
_$NowCopyWithImpl(this._value, this._then);
// ignore: unused_field
final $Val _value;
// ignore: unused_field
final $Res Function($Val) _then;
@pragma('vm:prefer-inline')
@override
$Res call({
Object? name = null,
Object? value = null,
}) {
return _then(_value.copyWith(
name: null == name
? _value.name
: name // ignore: cast_nullable_to_non_nullable
as String,
value: null == value
? _value.value
: value // ignore: cast_nullable_to_non_nullable
as String,
) as $Val);
}
}
/// @nodoc
abstract class _$$NowImplCopyWith<$Res> implements $NowCopyWith<$Res> {
factory _$$NowImplCopyWith(_$NowImpl value, $Res Function(_$NowImpl) then) =
__$$NowImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String name, String value});
}
/// @nodoc
class __$$NowImplCopyWithImpl<$Res> extends _$NowCopyWithImpl<$Res, _$NowImpl>
implements _$$NowImplCopyWith<$Res> {
__$$NowImplCopyWithImpl(_$NowImpl _value, $Res Function(_$NowImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@override
$Res call({
Object? name = null,
Object? value = null,
}) {
return _then(_$NowImpl(
name: null == name
? _value.name
: name // ignore: cast_nullable_to_non_nullable
as String,
value: null == value
? _value.value
: value // ignore: cast_nullable_to_non_nullable
as String,
));
}
}
/// @nodoc
@JsonSerializable()
class _$NowImpl implements _Now {
const _$NowImpl({required this.name, required this.value});
factory _$NowImpl.fromJson(Map<String, dynamic> json) =>
_$$NowImplFromJson(json);
@override
final String name;
@override
final String value;
@override
String toString() {
return 'Now(name: $name, value: $value)';
}
@override
bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$NowImpl &&
(identical(other.name, name) || other.name == name) &&
(identical(other.value, value) || other.value == value));
}
@JsonKey(ignore: true)
@override
int get hashCode => Object.hash(runtimeType, name, value);
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$NowImplCopyWith<_$NowImpl> get copyWith =>
__$$NowImplCopyWithImpl<_$NowImpl>(this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$NowImplToJson(
this,
);
}
}
abstract class _Now implements Now {
const factory _Now(
{required final String name, required final String value}) = _$NowImpl;
factory _Now.fromJson(Map<String, dynamic> json) = _$NowImpl.fromJson;
@override
String get name;
@override
String get value;
@override
@JsonKey(ignore: true)
_$$NowImplCopyWith<_$NowImpl> get copyWith =>
throw _privateConstructorUsedError;
}
Process _$ProcessFromJson(Map<String, dynamic> json) { Process _$ProcessFromJson(Map<String, dynamic> json) {
return _Process.fromJson(json); return _Process.fromJson(json);
} }

View File

@@ -11,7 +11,8 @@ _$UpdateConfigParamsImpl _$$UpdateConfigParamsImplFromJson(
_$UpdateConfigParamsImpl( _$UpdateConfigParamsImpl(
profilePath: json['profile-path'] as String?, profilePath: json['profile-path'] as String?,
config: ClashConfig.fromJson(json['config'] as Map<String, dynamic>), config: ClashConfig.fromJson(json['config'] as Map<String, dynamic>),
isPatch: json['is-patch'] as bool?, isPatch: json['is-patch'] as bool,
isCompatible: json['is-compatible'] as bool,
); );
Map<String, dynamic> _$$UpdateConfigParamsImplToJson( Map<String, dynamic> _$$UpdateConfigParamsImplToJson(
@@ -20,6 +21,7 @@ Map<String, dynamic> _$$UpdateConfigParamsImplToJson(
'profile-path': instance.profilePath, 'profile-path': instance.profilePath,
'config': instance.config, 'config': instance.config,
'is-patch': instance.isPatch, 'is-patch': instance.isPatch,
'is-compatible': instance.isCompatible,
}; };
_$ChangeProxyParamsImpl _$$ChangeProxyParamsImplFromJson( _$ChangeProxyParamsImpl _$$ChangeProxyParamsImplFromJson(
@@ -53,6 +55,7 @@ const _$MessageTypeEnumMap = {
MessageType.tun: 'tun', MessageType.tun: 'tun',
MessageType.delay: 'delay', MessageType.delay: 'delay',
MessageType.process: 'process', MessageType.process: 'process',
MessageType.now: 'now',
}; };
_$DelayImpl _$$DelayImplFromJson(Map<String, dynamic> json) => _$DelayImpl( _$DelayImpl _$$DelayImplFromJson(Map<String, dynamic> json) => _$DelayImpl(
@@ -66,6 +69,16 @@ Map<String, dynamic> _$$DelayImplToJson(_$DelayImpl instance) =>
'value': instance.value, 'value': instance.value,
}; };
_$NowImpl _$$NowImplFromJson(Map<String, dynamic> json) => _$NowImpl(
name: json['name'] as String,
value: json['value'] as String,
);
Map<String, dynamic> _$$NowImplToJson(_$NowImpl instance) => <String, dynamic>{
'name': instance.name,
'value': instance.value,
};
_$ProcessImpl _$$ProcessImplFromJson(Map<String, dynamic> json) => _$ProcessImpl _$$ProcessImplFromJson(Map<String, dynamic> json) =>
_$ProcessImpl( _$ProcessImpl(
uid: (json['uid'] as num).toInt(), uid: (json['uid'] as num).toInt(),

View File

@@ -27,11 +27,13 @@ Profile _$ProfileFromJson(Map<String, dynamic> json) => Profile(
userInfo: json['userInfo'] == null userInfo: json['userInfo'] == null
? null ? null
: UserInfo.fromJson(json['userInfo'] as Map<String, dynamic>), : UserInfo.fromJson(json['userInfo'] as Map<String, dynamic>),
groupName: json['groupName'] as String?,
proxyName: json['proxyName'] as String?, proxyName: json['proxyName'] as String?,
lastUpdateDate: json['lastUpdateDate'] == null lastUpdateDate: json['lastUpdateDate'] == null
? null ? null
: DateTime.parse(json['lastUpdateDate'] as String), : DateTime.parse(json['lastUpdateDate'] as String),
selectedMap: (json['selectedMap'] as Map<String, dynamic>?)?.map(
(k, e) => MapEntry(k, e as String),
),
autoUpdateDuration: json['autoUpdateDuration'] == null autoUpdateDuration: json['autoUpdateDuration'] == null
? null ? null
: Duration(microseconds: (json['autoUpdateDuration'] as num).toInt()), : Duration(microseconds: (json['autoUpdateDuration'] as num).toInt()),
@@ -41,11 +43,11 @@ Profile _$ProfileFromJson(Map<String, dynamic> json) => Profile(
Map<String, dynamic> _$ProfileToJson(Profile instance) => <String, dynamic>{ Map<String, dynamic> _$ProfileToJson(Profile instance) => <String, dynamic>{
'id': instance.id, 'id': instance.id,
'label': instance.label, 'label': instance.label,
'groupName': instance.groupName,
'proxyName': instance.proxyName, 'proxyName': instance.proxyName,
'url': instance.url, 'url': instance.url,
'lastUpdateDate': instance.lastUpdateDate?.toIso8601String(), 'lastUpdateDate': instance.lastUpdateDate?.toIso8601String(),
'autoUpdateDuration': instance.autoUpdateDuration.inMicroseconds, 'autoUpdateDuration': instance.autoUpdateDuration.inMicroseconds,
'userInfo': instance.userInfo, 'userInfo': instance.userInfo,
'autoUpdate': instance.autoUpdate, 'autoUpdate': instance.autoUpdate,
'selectedMap': instance.selectedMap,
}; };

View File

@@ -219,6 +219,7 @@ Proxy _$ProxyFromJson(Map<String, dynamic> json) {
mixin _$Proxy { mixin _$Proxy {
String get name => throw _privateConstructorUsedError; String get name => throw _privateConstructorUsedError;
String get type => throw _privateConstructorUsedError; String get type => throw _privateConstructorUsedError;
String? get now => throw _privateConstructorUsedError;
Map<String, dynamic> toJson() => throw _privateConstructorUsedError; Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@JsonKey(ignore: true) @JsonKey(ignore: true)
@@ -230,7 +231,7 @@ abstract class $ProxyCopyWith<$Res> {
factory $ProxyCopyWith(Proxy value, $Res Function(Proxy) then) = factory $ProxyCopyWith(Proxy value, $Res Function(Proxy) then) =
_$ProxyCopyWithImpl<$Res, Proxy>; _$ProxyCopyWithImpl<$Res, Proxy>;
@useResult @useResult
$Res call({String name, String type}); $Res call({String name, String type, String? now});
} }
/// @nodoc /// @nodoc
@@ -248,6 +249,7 @@ class _$ProxyCopyWithImpl<$Res, $Val extends Proxy>
$Res call({ $Res call({
Object? name = null, Object? name = null,
Object? type = null, Object? type = null,
Object? now = freezed,
}) { }) {
return _then(_value.copyWith( return _then(_value.copyWith(
name: null == name name: null == name
@@ -258,6 +260,10 @@ class _$ProxyCopyWithImpl<$Res, $Val extends Proxy>
? _value.type ? _value.type
: type // ignore: cast_nullable_to_non_nullable : type // ignore: cast_nullable_to_non_nullable
as String, as String,
now: freezed == now
? _value.now
: now // ignore: cast_nullable_to_non_nullable
as String?,
) as $Val); ) as $Val);
} }
} }
@@ -269,7 +275,7 @@ abstract class _$$ProxyImplCopyWith<$Res> implements $ProxyCopyWith<$Res> {
__$$ProxyImplCopyWithImpl<$Res>; __$$ProxyImplCopyWithImpl<$Res>;
@override @override
@useResult @useResult
$Res call({String name, String type}); $Res call({String name, String type, String? now});
} }
/// @nodoc /// @nodoc
@@ -285,6 +291,7 @@ class __$$ProxyImplCopyWithImpl<$Res>
$Res call({ $Res call({
Object? name = null, Object? name = null,
Object? type = null, Object? type = null,
Object? now = freezed,
}) { }) {
return _then(_$ProxyImpl( return _then(_$ProxyImpl(
name: null == name name: null == name
@@ -295,6 +302,10 @@ class __$$ProxyImplCopyWithImpl<$Res>
? _value.type ? _value.type
: type // ignore: cast_nullable_to_non_nullable : type // ignore: cast_nullable_to_non_nullable
as String, as String,
now: freezed == now
? _value.now
: now // ignore: cast_nullable_to_non_nullable
as String?,
)); ));
} }
} }
@@ -302,21 +313,21 @@ class __$$ProxyImplCopyWithImpl<$Res>
/// @nodoc /// @nodoc
@JsonSerializable() @JsonSerializable()
class _$ProxyImpl implements _Proxy { class _$ProxyImpl implements _Proxy {
const _$ProxyImpl({this.name = "", this.type = ""}); const _$ProxyImpl({required this.name, required this.type, this.now});
factory _$ProxyImpl.fromJson(Map<String, dynamic> json) => factory _$ProxyImpl.fromJson(Map<String, dynamic> json) =>
_$$ProxyImplFromJson(json); _$$ProxyImplFromJson(json);
@override @override
@JsonKey()
final String name; final String name;
@override @override
@JsonKey()
final String type; final String type;
@override
final String? now;
@override @override
String toString() { String toString() {
return 'Proxy(name: $name, type: $type)'; return 'Proxy(name: $name, type: $type, now: $now)';
} }
@override @override
@@ -325,12 +336,13 @@ class _$ProxyImpl implements _Proxy {
(other.runtimeType == runtimeType && (other.runtimeType == runtimeType &&
other is _$ProxyImpl && other is _$ProxyImpl &&
(identical(other.name, name) || other.name == name) && (identical(other.name, name) || other.name == name) &&
(identical(other.type, type) || other.type == type)); (identical(other.type, type) || other.type == type) &&
(identical(other.now, now) || other.now == now));
} }
@JsonKey(ignore: true) @JsonKey(ignore: true)
@override @override
int get hashCode => Object.hash(runtimeType, name, type); int get hashCode => Object.hash(runtimeType, name, type, now);
@JsonKey(ignore: true) @JsonKey(ignore: true)
@override @override
@@ -347,7 +359,10 @@ class _$ProxyImpl implements _Proxy {
} }
abstract class _Proxy implements Proxy { abstract class _Proxy implements Proxy {
const factory _Proxy({final String name, final String type}) = _$ProxyImpl; const factory _Proxy(
{required final String name,
required final String type,
final String? now}) = _$ProxyImpl;
factory _Proxy.fromJson(Map<String, dynamic> json) = _$ProxyImpl.fromJson; factory _Proxy.fromJson(Map<String, dynamic> json) = _$ProxyImpl.fromJson;
@@ -356,6 +371,8 @@ abstract class _Proxy implements Proxy {
@override @override
String get type; String get type;
@override @override
String? get now;
@override
@JsonKey(ignore: true) @JsonKey(ignore: true)
_$$ProxyImplCopyWith<_$ProxyImpl> get copyWith => _$$ProxyImplCopyWith<_$ProxyImpl> get copyWith =>
throw _privateConstructorUsedError; throw _privateConstructorUsedError;

View File

@@ -31,12 +31,14 @@ const _$GroupTypeEnumMap = {
}; };
_$ProxyImpl _$$ProxyImplFromJson(Map<String, dynamic> json) => _$ProxyImpl( _$ProxyImpl _$$ProxyImplFromJson(Map<String, dynamic> json) => _$ProxyImpl(
name: json['name'] as String? ?? "", name: json['name'] as String,
type: json['type'] as String? ?? "", type: json['type'] as String,
now: json['now'] as String?,
); );
Map<String, dynamic> _$$ProxyImplToJson(_$ProxyImpl instance) => Map<String, dynamic> _$$ProxyImplToJson(_$ProxyImpl instance) =>
<String, dynamic>{ <String, dynamic>{
'name': instance.name, 'name': instance.name,
'type': instance.type, 'type': instance.type,
'now': instance.now,
}; };

File diff suppressed because it is too large Load Diff

View File

@@ -12,4 +12,5 @@ export 'package.dart';
export 'common.dart'; export 'common.dart';
export 'ffi.dart'; export 'ffi.dart';
export 'selector.dart'; export 'selector.dart';
export 'navigation.dart'; export 'navigation.dart';
export 'dav.dart';

View File

@@ -12,6 +12,8 @@ import 'common.dart';
part 'generated/profile.g.dart'; part 'generated/profile.g.dart';
typedef SelectedMap = Map<String, String>;
@JsonSerializable() @JsonSerializable()
class UserInfo { class UserInfo {
int upload; int upload;
@@ -62,61 +64,60 @@ class UserInfo {
class Profile { class Profile {
String id; String id;
String? label; String? label;
String? groupName;
String? proxyName; String? proxyName;
String? url; String? url;
DateTime? lastUpdateDate; DateTime? lastUpdateDate;
Duration autoUpdateDuration; Duration autoUpdateDuration;
UserInfo? userInfo; UserInfo? userInfo;
bool autoUpdate; bool autoUpdate;
SelectedMap selectedMap;
Profile({ Profile({
String? id, String? id,
this.label, this.label,
this.url, this.url,
this.userInfo, this.userInfo,
this.groupName,
this.proxyName, this.proxyName,
this.lastUpdateDate, this.lastUpdateDate,
SelectedMap? selectedMap,
Duration? autoUpdateDuration, Duration? autoUpdateDuration,
this.autoUpdate = true, this.autoUpdate = true,
}) : id = id ?? DateTime.now().millisecondsSinceEpoch.toString(), }) : id = id ?? DateTime.now().millisecondsSinceEpoch.toString(),
autoUpdateDuration = autoUpdateDuration =
autoUpdateDuration ?? appConstant.defaultUpdateDuration; autoUpdateDuration ?? defaultUpdateDuration,
selectedMap = selectedMap ?? {};
ProfileType get type => url == null ? ProfileType.file : ProfileType.url; ProfileType get type => url == null ? ProfileType.file : ProfileType.url;
Future<Result<bool>> checkAndUpdate() async {
final isExists = await check();
if(!isExists){
if(url != null){
return await update();
}
return Result.error();
}
return Result.success();
}
Future<Result<bool>> update() async { Future<Result<bool>> update() async {
if (url == null) { if (url == null) {
return Result.error( return Result.error(
message: appLocalizations.unableToUpdateCurrentProfileDesc, appLocalizations.unableToUpdateCurrentProfileDesc,
); );
} }
final responseResult = await Request.getFileResponseForUrl(url!); final responseResult = await Request.getFileResponseForUrl(url!);
final response = responseResult.data; final response = responseResult.data;
if (responseResult.type != ResultType.success || response == null) { if (responseResult.type != ResultType.success || response == null) {
return Result.error(message: responseResult.message); return Result.error(responseResult.message);
} }
final disposition = response.headers['content-disposition']; final disposition = response.headers['content-disposition'];
if (disposition != null && label == null) { label ??= other.getFileNameForDisposition(disposition) ?? id;
final parseValue = HeaderValue.parse(disposition);
parseValue.parameters.forEach(
(key, value) {
if (key.startsWith("filename")) {
if (key == "filename*") {
label = Uri.decodeComponent((value ?? "").split("'").last);
} else {
label = value ?? id;
}
}
},
);
}
final userinfo = response.headers['subscription-userinfo']; final userinfo = response.headers['subscription-userinfo'];
userInfo = UserInfo.formHString(userinfo); userInfo = UserInfo.formHString(userinfo);
final saveResult = await saveFile(response.bodyBytes); final saveResult = await saveFile(response.bodyBytes);
if (saveResult.type == ResultType.error) { if (saveResult.type == ResultType.error) {
return Result.error(message: saveResult.message); return Result.error(saveResult.message);
} }
lastUpdateDate = DateTime.now(); lastUpdateDate = DateTime.now();
return Result.success(); return Result.success();
@@ -130,7 +131,7 @@ class Profile {
Future<Result<void>> saveFile(Uint8List bytes) async { Future<Result<void>> saveFile(Uint8List bytes) async {
final isValidate = clashCore.validateConfig(utf8.decode(bytes)); final isValidate = clashCore.validateConfig(utf8.decode(bytes));
if (!isValidate) { if (!isValidate) {
return Result.error(message: appLocalizations.profileParseErrorDesc); return Result.error(appLocalizations.profileParseErrorDesc);
} }
final path = await appPath.getProfilePath(id); final path = await appPath.getProfilePath(id);
final file = File(path!); final file = File(path!);
@@ -158,7 +159,6 @@ class Profile {
runtimeType == other.runtimeType && runtimeType == other.runtimeType &&
id == other.id && id == other.id &&
label == other.label && label == other.label &&
groupName == other.groupName &&
proxyName == other.proxyName && proxyName == other.proxyName &&
url == other.url && url == other.url &&
lastUpdateDate == other.lastUpdateDate && lastUpdateDate == other.lastUpdateDate &&
@@ -170,7 +170,6 @@ class Profile {
int get hashCode => int get hashCode =>
id.hashCode ^ id.hashCode ^
label.hashCode ^ label.hashCode ^
groupName.hashCode ^
proxyName.hashCode ^ proxyName.hashCode ^
url.hashCode ^ url.hashCode ^
lastUpdateDate.hashCode ^ lastUpdateDate.hashCode ^
@@ -180,7 +179,7 @@ class Profile {
@override @override
String toString() { String toString() {
return 'Profile{id: $id, label: $label, groupName: $groupName, proxyName: $proxyName, url: $url, lastUpdateDate: $lastUpdateDate, autoUpdateDuration: $autoUpdateDuration, userInfo: $userInfo, autoUpdate: $autoUpdate}'; return 'Profile{id: $id, label: $label, proxyName: $proxyName, url: $url, lastUpdateDate: $lastUpdateDate, autoUpdateDuration: $autoUpdateDuration, userInfo: $userInfo, autoUpdate: $autoUpdate}';
} }
Profile copyWith({ Profile copyWith({
@@ -192,14 +191,15 @@ class Profile {
DateTime? lastUpdateDate, DateTime? lastUpdateDate,
Duration? autoUpdateDuration, Duration? autoUpdateDuration,
bool? autoUpdate, bool? autoUpdate,
SelectedMap? selectedMap,
}) { }) {
return Profile( return Profile(
id: id, id: id,
label: label ?? this.label, label: label ?? this.label,
url: url ?? this.url, url: url ?? this.url,
groupName: groupName ?? this.groupName,
proxyName: proxyName ?? this.proxyName, proxyName: proxyName ?? this.proxyName,
userInfo: userInfo ?? this.userInfo, userInfo: userInfo ?? this.userInfo,
selectedMap: selectedMap ?? this.selectedMap,
lastUpdateDate: lastUpdateDate ?? this.lastUpdateDate, lastUpdateDate: lastUpdateDate ?? this.lastUpdateDate,
autoUpdateDuration: autoUpdateDuration ?? this.autoUpdateDuration, autoUpdateDuration: autoUpdateDuration ?? this.autoUpdateDuration,
autoUpdate: autoUpdate ?? this.autoUpdate, autoUpdate: autoUpdate ?? this.autoUpdate,

View File

@@ -6,7 +6,7 @@ part 'generated/proxy.g.dart';
part 'generated/proxy.freezed.dart'; part 'generated/proxy.freezed.dart';
typedef DelayMap = Map<String, int?>; typedef ProxyMap = Map<String, Proxy>;
@freezed @freezed
class Group with _$Group { class Group with _$Group {
@@ -23,8 +23,9 @@ class Group with _$Group {
@freezed @freezed
class Proxy with _$Proxy { class Proxy with _$Proxy {
const factory Proxy({ const factory Proxy({
@Default("") String name, required String name,
@Default("") String type, required String type,
String? now,
}) = _Proxy; }) = _Proxy;
factory Proxy.fromJson(Map<String, Object?> json) => _$ProxyFromJson(json); factory Proxy.fromJson(Map<String, Object?> json) => _$ProxyFromJson(json);

View File

@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:freezed_annotation/freezed_annotation.dart';
import 'config.dart'; import 'config.dart';
import 'navigation.dart'; import 'navigation.dart';
import 'package.dart';
import 'profile.dart'; import 'profile.dart';
import 'proxy.dart';
part 'generated/selector.freezed.dart'; part 'generated/selector.freezed.dart';
@@ -31,7 +31,6 @@ class NetworkDetectionSelectorState with _$NetworkDetectionSelectorState {
const factory NetworkDetectionSelectorState({ const factory NetworkDetectionSelectorState({
required String? currentProxyName, required String? currentProxyName,
required int? delay, required int? delay,
required bool isInit,
}) = _NetworkDetectionSelectorState; }) = _NetworkDetectionSelectorState;
} }
@@ -40,17 +39,10 @@ class ProfilesSelectorState with _$ProfilesSelectorState {
const factory ProfilesSelectorState({ const factory ProfilesSelectorState({
required List<Profile> profiles, required List<Profile> profiles,
required String? currentProfileId, required String? currentProfileId,
required ViewMode viewMode,
}) = _ProfilesSelectorState; }) = _ProfilesSelectorState;
} }
@freezed
class PackageListSelectorState with _$PackageListSelectorState {
const factory PackageListSelectorState({
required AccessControl accessControl,
required List<Package> packages,
}) = _PackageListSelectorState;
}
@freezed @freezed
class ApplicationSelectorState with _$ApplicationSelectorState { class ApplicationSelectorState with _$ApplicationSelectorState {
const factory ApplicationSelectorState({ const factory ApplicationSelectorState({
@@ -60,14 +52,6 @@ class ApplicationSelectorState with _$ApplicationSelectorState {
}) = _ApplicationSelectorState; }) = _ApplicationSelectorState;
} }
@freezed
class HomeLayoutSelectorState with _$HomeLayoutSelectorState{
const factory HomeLayoutSelectorState({
required List<NavigationItem> navigationItems,
required int currentIndex,
})=_HomeLayoutSelectorState;
}
@freezed @freezed
class TrayContainerSelectorState with _$TrayContainerSelectorState{ class TrayContainerSelectorState with _$TrayContainerSelectorState{
const factory TrayContainerSelectorState({ const factory TrayContainerSelectorState({
@@ -86,18 +70,59 @@ class UpdateNavigationsSelector with _$UpdateNavigationsSelector{
}) = _UpdateNavigationsSelector; }) = _UpdateNavigationsSelector;
} }
@freezed @freezed
class HomeCommonScaffoldSelectorState with _$HomeCommonScaffoldSelectorState { class HomeSelectorState with _$HomeSelectorState {
const factory HomeCommonScaffoldSelectorState({ const factory HomeSelectorState({
required String currentLabel, required String currentLabel,
required List<NavigationItem> navigationItems,
required ViewMode viewMode,
required String? locale, required String? locale,
}) = _HomeCommonScaffoldSelectorState; }) = _HomeSelectorState;
} }
@freezed @freezed
class HomeNavigationSelectorState with _$HomeNavigationSelectorState{ class HomeBodySelectorState with _$HomeBodySelectorState {
const factory HomeNavigationSelectorState({ const factory HomeBodySelectorState({
required int currentIndex, required List<NavigationItem> navigationItems,
required String? locale, }) = _HomeBodySelectorState;
}) = _HomeNavigationSelectorState;
} }
@freezed
class ProxiesCardSelectorState with _$ProxiesCardSelectorState{
const factory ProxiesCardSelectorState({
required bool isSelected,
}) = _ProxiesCardSelectorState;
}
@freezed
class ProxiesSelectorState with _$ProxiesSelectorState{
const factory ProxiesSelectorState({
required List<String> groupNames,
}) = _ProxiesSelectorState;
}
@freezed
class ProxiesTabViewSelectorState with _$ProxiesTabViewSelectorState{
const factory ProxiesTabViewSelectorState({
required ProxiesSortType proxiesSortType,
required num sortNum,
required Group group,
required ViewMode viewMode,
}) = _ProxiesTabViewSelectorState;
}
@freezed
class MoreToolsSelectorState with _$MoreToolsSelectorState {
const factory MoreToolsSelectorState({
required List<NavigationItem> navigationItems,
}) = _MoreToolsSelectorState;
}
@freezed
class PackageListSelectorState with _$PackageListSelectorState {
const factory PackageListSelectorState({
required AccessControl accessControl,
required bool isAccessControl,
}) = _PackageListSelectorState;
}

View File

@@ -6,10 +6,10 @@ class SystemColorSchemes {
ColorScheme? lightColorScheme, ColorScheme? lightColorScheme,
ColorScheme? darkColorScheme, ColorScheme? darkColorScheme,
}) : lightColorScheme = lightColorScheme ?? }) : lightColorScheme = lightColorScheme ??
ColorScheme.fromSeed(seedColor: appConstant.defaultPrimaryColor), ColorScheme.fromSeed(seedColor: defaultPrimaryColor),
darkColorScheme = darkColorScheme ?? darkColorScheme = darkColorScheme ??
ColorScheme.fromSeed( ColorScheme.fromSeed(
seedColor: appConstant.defaultPrimaryColor, seedColor: defaultPrimaryColor,
brightness: Brightness.dark, brightness: Brightness.dark,
); );
ColorScheme lightColorScheme; ColorScheme lightColorScheme;

View File

@@ -1,8 +1,6 @@
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart'; import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -14,28 +12,133 @@ typedef OnSelected = void Function(int index);
class HomePage extends StatelessWidget { class HomePage extends StatelessWidget {
const HomePage({super.key}); const HomePage({super.key});
Widget _buildBody({ _getNavigationBar({
required ViewMode viewMode,
required List<NavigationItem> navigationItems, required List<NavigationItem> navigationItems,
required int currentIndex,
}) { }) {
globalState.currentNavigationItems = navigationItems; if (viewMode == ViewMode.mobile) {
return Selector<AppState, int>( return NavigationBar(
selector: (_, appState) { destinations: navigationItems
final index = navigationItems.lastIndexWhere( .map(
(element) => element.label == appState.currentLabel, (e) => NavigationDestination(
); icon: e.icon,
return index == -1 ? 0 : index; label: Intl.message(e.label),
}, ),
builder: (context, currentIndex, __) { )
if (globalState.pageController != null) { .toList(),
WidgetsBinding.instance.addPostFrameCallback((_) { onDestinationSelected: globalState.appController.toPage,
context.appController.toPage(currentIndex, hasAnimate: true); selectedIndex: currentIndex,
}); );
} else { }
globalState.pageController = PageController( final extended = viewMode == ViewMode.desktop;
initialPage: currentIndex, return NavigationRail(
keepPage: true, destinations: navigationItems
.map(
(e) => NavigationRailDestination(
icon: e.icon,
label: Text(
Intl.message(e.label),
),
),
)
.toList(),
onDestinationSelected: globalState.appController.toPage,
extended: extended,
minExtendedWidth: 172,
selectedIndex: currentIndex,
labelType: extended
? NavigationRailLabelType.none
: NavigationRailLabelType.selected,
);
}
@override
Widget build(BuildContext context) {
return PopContainer(
child: Selector2<AppState, Config, HomeSelectorState>(
selector: (_, appState, config) => HomeSelectorState(
currentLabel: appState.currentLabel,
navigationItems: appState.currentNavigationItems,
viewMode: appState.viewMode,
locale: config.locale,
),
builder: (_, state, child) {
final viewMode = state.viewMode;
final navigationItems = state.navigationItems;
final currentLabel = state.currentLabel;
final index = navigationItems.lastIndexWhere(
(element) => element.label == currentLabel,
); );
} final currentIndex = index == -1 ? 0 : index;
final navigationBar = _getNavigationBar(
viewMode: viewMode,
navigationItems: navigationItems,
currentIndex: currentIndex,
);
final bottomNavigationBar =
viewMode == ViewMode.mobile ? navigationBar : null;
Widget body;
if (viewMode != ViewMode.mobile) {
body = Row(
children: [
navigationBar,
Expanded(
flex: 1,
child: child!,
)
],
);
} else {
body = child!;
}
return CommonScaffold(
key: globalState.homeScaffoldKey,
title: Intl.message(
currentLabel,
),
body: body,
bottomNavigationBar: bottomNavigationBar,
);
},
child: const HomeBody(
key: Key("home_boy"),
),
),
);
}
}
class HomeBody extends StatelessWidget {
const HomeBody({super.key});
_updatePageIndex(List<NavigationItem> navigationItems) {
final currentLabel = globalState.appController.appState.currentLabel;
final index = navigationItems.lastIndexWhere(
(element) => element.label == currentLabel,
);
final currentIndex = index == -1 ? 0 : index;
if (globalState.pageController != null) {
WidgetsBinding.instance.addPostFrameCallback((_) {
globalState.appController.toPage(currentIndex);
});
} else {
globalState.pageController = PageController(
initialPage: currentIndex,
keepPage: true,
);
}
}
@override
Widget build(BuildContext context) {
return Selector<AppState, HomeBodySelectorState>(
selector: (_, appState) => HomeBodySelectorState(
navigationItems: appState.currentNavigationItems,
),
builder: (_, state, __) {
final navigationItems = state.navigationItems;
_updatePageIndex(navigationItems);
return PageView.builder( return PageView.builder(
controller: globalState.pageController, controller: globalState.pageController,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
@@ -43,6 +146,7 @@ class HomePage extends StatelessWidget {
itemBuilder: (_, index) { itemBuilder: (_, index) {
final navigationItem = navigationItems[index]; final navigationItem = navigationItems[index];
return KeepContainer( return KeepContainer(
key: Key(navigationItem.label),
child: navigationItem.fragment, child: navigationItem.fragment,
); );
}, },
@@ -50,158 +154,4 @@ class HomePage extends StatelessWidget {
}, },
); );
} }
_buildNavigationRail({
required List<NavigationItem> navigationItems,
bool extended = false,
}) {
return Selector2<AppState, Config, HomeNavigationSelectorState>(
selector: (_, appState, config) {
final index = navigationItems.lastIndexWhere(
(element) => element.label == appState.currentLabel,
);
return HomeNavigationSelectorState(
currentIndex: index == -1 ? 0 : index,
locale: config.locale,
);
},
builder: (context, state, __) {
return AdaptiveScaffold.standardNavigationRail(
onDestinationSelected: context.appController.toPage,
destinations: navigationItems
.map(
(e) => NavigationRailDestination(
icon: e.icon,
label: Text(
Intl.message(e.label),
),
),
)
.toList(),
extended: extended,
width: extended ? 160 : 80,
selectedIndex: state.currentIndex,
labelType: extended
? NavigationRailLabelType.none
: NavigationRailLabelType.selected,
);
},
);
}
_buildBottomNavigationBar({
required List<NavigationItem> navigationItems,
}) {
return Selector2<AppState, Config, HomeNavigationSelectorState>(
selector: (_, appState, config) {
final index = navigationItems.lastIndexWhere(
(element) => element.label == appState.currentLabel,
);
return HomeNavigationSelectorState(
currentIndex: index == -1 ? 0 : index,
locale: config.locale,
);
},
builder: (context, state, __) {
final mobileDestinations = navigationItems
.map(
(e) => NavigationDestination(
icon: e.icon,
label: Intl.message(e.label),
),
)
.toList();
return AdaptiveScaffold.standardBottomNavigationBar(
destinations: mobileDestinations,
onDestinationSelected: context.appController.toPage,
currentIndex: state.currentIndex,
);
},
);
}
@override
Widget build(BuildContext context) {
return PopContainer(
child: Selector2<AppState, Config, HomeCommonScaffoldSelectorState>(
selector: (_, appState, config) => HomeCommonScaffoldSelectorState(
currentLabel: appState.currentLabel,
locale: config.locale,
),
builder: (_, state, child) {
return CommonScaffold(
key: globalState.homeScaffoldKey,
title: Text(
Intl.message(state.currentLabel),
),
body: child!,
);
},
child: Selector<AppState, List<NavigationItem>>(
selector: (_, appState) => appState.navigationItems,
builder: (_, navigationItems, __) {
debugPrint("[Home] update===>");
final desktopNavigationItems = navigationItems
.where(
(element) =>
element.modes.contains(NavigationItemMode.desktop),
)
.toList();
final mobileNavigationItems = navigationItems
.where(
(element) =>
element.modes.contains(NavigationItemMode.mobile),
)
.toList();
return AdaptiveLayout(
transitionDuration: kThemeAnimationDuration,
primaryNavigation: SlotLayout(
config: {
Breakpoints.medium: SlotLayout.from(
key: const Key('primary_navigation_medium'),
builder: (_) => _buildNavigationRail(
navigationItems: desktopNavigationItems,
),
),
Breakpoints.large: SlotLayout.from(
key: const Key('primary_navigation_large'),
builder: (_) => _buildNavigationRail(
navigationItems: desktopNavigationItems,
extended: true,
),
),
},
),
body: SlotLayout(
config: {
Breakpoints.mediumAndUp: SlotLayout.from(
key: const Key('body_mediumAndUp'),
builder: (_) => _buildBody(
navigationItems: desktopNavigationItems,
),
),
Breakpoints.small: SlotLayout.from(
key: const Key('body_small'),
builder: (_) => _buildBody(
navigationItems: mobileNavigationItems,
),
)
},
),
bottomNavigation: SlotLayout(
config: <Breakpoint, SlotLayoutConfig>{
Breakpoints.small: SlotLayout.from(
key: const Key('bottom_navigation_small'),
builder: (_) => _buildBottomNavigationBar(
navigationItems: mobileNavigationItems,
),
)
},
),
);
},
),
),
);
}
} }

View File

@@ -1,5 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'dart:math'; import 'dart:math';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mobile_scanner/mobile_scanner.dart'; import 'package:mobile_scanner/mobile_scanner.dart';
@@ -82,47 +83,63 @@ class _ScanPageState extends State<ScanPage> with WidgetsBindingObserver {
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
leading: IconButton( leading: IconButton(
style: const ButtonStyle( style: const ButtonStyle(
iconSize: MaterialStatePropertyAll(32), iconSize: WidgetStatePropertyAll(32),
foregroundColor: MaterialStatePropertyAll(Colors.white), foregroundColor: WidgetStatePropertyAll(Colors.white),
), ),
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
icon: const Icon(Icons.close), icon: const Icon(Icons.close),
), ),
actions: [
ValueListenableBuilder<MobileScannerState>(
valueListenable: controller,
builder: (context, state, _) {
var icon = const Icon(Icons.flash_off);
var backgroundColor = Colors.black12;
switch (state.torchState) {
case TorchState.off:
icon = const Icon(Icons.flash_off);
backgroundColor = Colors.black12;
case TorchState.on:
icon = const Icon(Icons.flash_on);
backgroundColor = Colors.orange;
case TorchState.unavailable:
icon = const Icon(Icons.flash_off);
backgroundColor = Colors.transparent;
}
return Container(
margin: const EdgeInsets.symmetric(horizontal: 8),
child: AbsorbPointer(
absorbing: state.torchState == TorchState.unavailable,
child: IconButton(
color: Colors.white,
icon: icon,
style: ButtonStyle(
foregroundColor: const WidgetStatePropertyAll(Colors.white),
backgroundColor: WidgetStatePropertyAll(backgroundColor),
),
onPressed: () => controller.toggleTorch(),
),
),
);
},
)
],
), ),
Container( Container(
margin: const EdgeInsets.only(bottom: 32), margin: const EdgeInsets.only(bottom: 32),
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
child: ValueListenableBuilder<MobileScannerState>( child: IconButton(
valueListenable: controller, color: Colors.white,
builder: (context, state, _) { style: const ButtonStyle(
var icon = const Icon(Icons.flash_off); foregroundColor: WidgetStatePropertyAll(Colors.white),
var backgroundColor = Colors.black12; backgroundColor: WidgetStatePropertyAll(Colors.grey),
switch (state.torchState) { ),
case TorchState.off: padding: const EdgeInsets.all(16),
icon = const Icon(Icons.flash_off); iconSize: 32.0,
backgroundColor = Colors.black12; onPressed: globalState.appController.addProfileFormQrCode,
case TorchState.on: icon: const Icon(Icons.photo_camera_back),
icon = const Icon(Icons.flash_on);
backgroundColor = Colors.orange;
case TorchState.unavailable:
icon = const Icon(Icons.no_flash);
backgroundColor = Colors.grey;
}
return IconButton(
color: Colors.white,
icon: icon,
style: ButtonStyle(
foregroundColor:
const MaterialStatePropertyAll(Colors.white),
backgroundColor: MaterialStatePropertyAll(backgroundColor),
),
padding: const EdgeInsets.all(16),
iconSize: 32.0,
onPressed: () => controller.toggleTorch(),
);
},
), ),
), ),
], ],
@@ -197,4 +214,4 @@ class ScannerOverlay extends CustomPainter {
return scanWindow != oldDelegate.scanWindow || return scanWindow != oldDelegate.scanWindow ||
borderRadius != oldDelegate.borderRadius; borderRadius != oldDelegate.borderRadius;
} }
} }

View File

@@ -1,6 +1,7 @@
import 'dart:async'; import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'dart:isolate';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -44,9 +45,11 @@ class App {
Future<List<Package>> getPackages() async { Future<List<Package>> getPackages() async {
final packagesString = final packagesString =
await methodChannel?.invokeMethod<String>("getPackages"); await methodChannel?.invokeMethod<String>("getPackages");
final List<dynamic> packagesRaw = return Isolate.run<List<Package>>(() {
packagesString != null ? json.decode(packagesString) : []; final List<dynamic> packagesRaw =
return packagesRaw.map((e) => Package.fromJson(e)).toList(); packagesString != null ? json.decode(packagesString) : [];
return packagesRaw.map((e) => Package.fromJson(e)).toList();
});
} }
Future<ImageProvider?> getPackageIcon(String packageName) async { Future<ImageProvider?> getPackageIcon(String packageName) async {

View File

@@ -4,25 +4,25 @@ import 'dart:io';
import 'package:animations/animations.dart'; import 'package:animations/animations.dart';
import 'package:fl_clash/clash/clash.dart'; import 'package:fl_clash/clash/clash.dart';
import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/plugins/app.dart';
import 'package:fl_clash/widgets/scaffold.dart'; import 'package:fl_clash/widgets/scaffold.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'controller.dart';
import 'models/models.dart'; import 'models/models.dart';
import 'common/common.dart'; import 'common/common.dart';
class GlobalState { class GlobalState {
Timer? timer; Timer? timer;
Timer? currentDelayTimer; Function? healthcheckLockDebounce;
Timer? groupsUpdateTimer;
Function? updateCurrentDelayDebounce; Function? updateCurrentDelayDebounce;
PageController? pageController; PageController? pageController;
final navigatorKey = GlobalKey<NavigatorState>(); final navigatorKey = GlobalKey<NavigatorState>();
final Map<int, String?> packageNameMap = {}; final Map<int, String?> packageNameMap = {};
late AppController appController;
GlobalKey<CommonScaffoldState> homeScaffoldKey = GlobalKey(); GlobalKey<CommonScaffoldState> homeScaffoldKey = GlobalKey();
List<Function> updateFunctionLists = []; List<Function> updateFunctionLists = [];
List<NavigationItem> currentNavigationItems = []; bool healthcheckLock = false;
bool updatePackagesLock = false;
startListenUpdate() { startListenUpdate() {
if (timer != null && timer!.isActive == true) return; if (timer != null && timer!.isActive == true) return;
@@ -38,17 +38,19 @@ class GlobalState {
timer?.cancel(); timer?.cancel();
} }
Future<bool> updateClashConfig({ Future<String> updateClashConfig({
required ClashConfig clashConfig, required ClashConfig clashConfig,
required Config config, required Config config,
bool isPatch = true, bool isPatch = true,
}) async { }) async {
final profilePath = await appPath.getProfilePath(config.currentProfileId); final profilePath = await appPath.getProfilePath(config.currentProfileId);
await config.currentProfile?.checkAndUpdate();
debugPrint("update config"); debugPrint("update config");
return clashCore.updateConfig(UpdateConfigParams( return clashCore.updateConfig(UpdateConfigParams(
profilePath: profilePath, profilePath: profilePath,
config: clashConfig, config: clashConfig,
isPatch: isPatch, isPatch: isPatch,
isCompatible: config.isCompatible,
)); ));
} }
@@ -74,17 +76,23 @@ class GlobalState {
stopListenUpdate(); stopListenUpdate();
} }
void updateCurrentDelay( applyProfile({
String? proxyName, required AppState appState,
) { required Config config,
updateCurrentDelayDebounce ??= debounce<Function(String?)>((proxyName) { required ClashConfig clashConfig,
if (proxyName != null) { }) async {
clashCore.delay( final res = await updateClashConfig(
proxyName, clashConfig: clashConfig,
); config: config,
} isPatch: false,
}); );
updateCurrentDelayDebounce!([proxyName]); if (res.isNotEmpty) return Result.error(res);
await updateGroups(appState);
changeProxy(
appState: appState,
config: config,
clashConfig: clashConfig,
);
} }
init({ init({
@@ -100,21 +108,33 @@ class GlobalState {
); );
} }
if (!appState.isInit) return; if (!appState.isInit) return;
await updateClashConfig( await applyProfile(
clashConfig: clashConfig, appState: appState,
config: config, config: config,
isPatch: false, clashConfig: clashConfig,
); );
updateGroups(appState);
updateCoreVersionInfo(appState); updateCoreVersionInfo(appState);
} }
updatePackages(AppState appState) async { changeProxy({
if (appState.packages.isEmpty && updatePackagesLock == false) { required AppState appState,
updatePackagesLock = true; required Config config,
appState.packages = await app?.getPackages() ?? []; required ClashConfig clashConfig,
updatePackagesLock = false; }) {
} WidgetsBinding.instance.addPostFrameCallback((_) {
if (config.profiles.isEmpty) {
stopSystemProxy();
return;
}
config.currentSelectedMap.forEach((key, value) {
clashCore.changeProxy(
ChangeProxyParams(
groupName: key,
proxyName: value,
),
);
});
});
} }
updateNavigationItems({ updateNavigationItems({
@@ -122,34 +142,42 @@ class GlobalState {
required Config config, required Config config,
required ClashConfig clashConfig, required ClashConfig clashConfig,
}) { }) {
final hasGroups = appState.getCurrentGroups(clashConfig.mode).isNotEmpty; final group = appState.currentGroups;
final hasProfile = config.profiles.isNotEmpty; final hasProfile = config.profiles.isNotEmpty;
appState.navigationItems = navigation.getItems( appState.navigationItems = navigation.getItems(
openLogs: config.openLogs, openLogs: config.openLogs,
hasProxies: hasGroups && hasProfile, hasProxies: group.isNotEmpty && hasProfile,
); );
} }
updateGroups(AppState appState) { Future<void> updateGroups(AppState appState) async {
appState.groups = clashCore.getProxiesGroups(); appState.groups = await clashCore.getProxiesGroups();
} }
showMessage({ showMessage({
required String title, required String title,
required InlineSpan message, required InlineSpan message,
Function()? onTab, Function()? onTab,
String? confirmText,
}) { }) {
showCommonDialog( showCommonDialog(
child: Builder( child: Builder(
builder: (context) { builder: (context) {
return AlertDialog( return AlertDialog(
title: Text(title), title: Text(title),
content: SizedBox( content: Container(
width: 300, width: 300,
child: RichText( constraints: const BoxConstraints(
text: TextSpan( maxHeight: 200
),
child: SingleChildScrollView(
child: RichText(
overflow: TextOverflow.visible,
text: TextSpan(
style: Theme.of(context).textTheme.labelLarge, style: Theme.of(context).textTheme.labelLarge,
children: [message]), children: [message],
),
),
), ),
), ),
actions: [ actions: [
@@ -158,7 +186,7 @@ class GlobalState {
() { () {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
child: Text(appLocalizations.confirm), child: Text(confirmText ?? appLocalizations.confirm),
) )
], ],
); );
@@ -167,7 +195,7 @@ class GlobalState {
); );
} }
showCommonDialog<T>({ Future<T?> showCommonDialog<T>({
required Widget child, required Widget child,
}) async { }) async {
return await showModal<T>( return await showModal<T>(
@@ -176,29 +204,16 @@ class GlobalState {
barrierColor: Colors.black38, barrierColor: Colors.black38,
), ),
builder: (_) => child, builder: (_) => child,
filter: appConstant.filter, filter: filter,
); );
} }
checkUpdate(Function()? onTab) async {
final result = await Request.checkForUpdate();
if (result.type == ResultType.success) {
showMessage(
title: appLocalizations.discovery,
message: TextSpan(
text: result.data,
),
onTab: onTab,
);
}
}
updateTraffic({ updateTraffic({
AppState? appState, AppState? appState,
required Config config, required Config config,
}) { }) {
final traffic = clashCore.getTraffic(); final traffic = clashCore.getTraffic();
if(appState != null){ if (appState != null) {
appState.addTraffic(traffic); appState.addTraffic(traffic);
} }
if (Platform.isAndroid) { if (Platform.isAndroid) {
@@ -210,6 +225,51 @@ class GlobalState {
); );
} }
} }
showSnackBar(
BuildContext context, {
required String message,
SnackBarAction? action,
}) {
final width = context.width;
EdgeInsets margin;
if (width < 600) {
margin = const EdgeInsets.only(
bottom: 96,
right: 16,
left: 16,
);
} else {
margin = EdgeInsets.only(
bottom: 16,
left: 16,
right: width - 316,
);
}
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
action: action,
content: Text(message),
behavior: SnackBarBehavior.floating,
duration: const Duration(milliseconds: 1500),
margin: margin,
),
);
}
void updateCurrentDelay(
String? proxyName,
) {
updateCurrentDelayDebounce ??= debounce<Function(String?)>((proxyName) {
if (proxyName != null) {
debugPrint("[delay]=====> $proxyName");
clashCore.delay(
proxyName,
);
}
});
updateCurrentDelayDebounce!([proxyName]);
}
} }
final globalState = GlobalState(); final globalState = GlobalState();

View File

@@ -1,4 +1,4 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
@@ -16,6 +16,7 @@ class AndroidContainer extends StatefulWidget {
class _AndroidContainerState extends State<AndroidContainer> class _AndroidContainerState extends State<AndroidContainer>
with WidgetsBindingObserver { with WidgetsBindingObserver {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@@ -27,7 +28,7 @@ class _AndroidContainerState extends State<AndroidContainer>
Future<void> didChangeAppLifecycleState(AppLifecycleState state) async { Future<void> didChangeAppLifecycleState(AppLifecycleState state) async {
final isPaused = state == AppLifecycleState.paused; final isPaused = state == AppLifecycleState.paused;
if (isPaused) { if (isPaused) {
await context.appController.savePreferences(); await globalState.appController.savePreferences();
} }
} }

View File

@@ -1,5 +1,6 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/models.dart'; import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -15,7 +16,6 @@ class AppStateContainer extends StatelessWidget {
return Selector<Config, bool>( return Selector<Config, bool>(
selector: (_, config) => config.autoLaunch, selector: (_, config) => config.autoLaunch,
builder: (_, isAutoLaunch, child) { builder: (_, isAutoLaunch, child) {
debugPrint("[autoLaunchContainer] update===>");
autoLaunch?.updateStatus(isAutoLaunch); autoLaunch?.updateStatus(isAutoLaunch);
return child!; return child!;
}, },
@@ -24,21 +24,19 @@ class AppStateContainer extends StatelessWidget {
} }
_updateNavigationsContainer(Widget child) { _updateNavigationsContainer(Widget child) {
return Selector3<AppState, Config, ClashConfig, UpdateNavigationsSelector>( return Selector2<AppState, Config, UpdateNavigationsSelector>(
selector: (_, appState, config, clashConfig) { selector: (_, appState, config) {
final hasGroups = final group = appState.currentGroups;
appState.getCurrentGroups(clashConfig.mode).isNotEmpty;
final hasProfile = config.profiles.isNotEmpty; final hasProfile = config.profiles.isNotEmpty;
return UpdateNavigationsSelector( return UpdateNavigationsSelector(
openLogs: config.openLogs, openLogs: config.openLogs,
hasProxies: hasGroups && hasProfile, hasProxies: group.isNotEmpty && hasProfile,
); );
}, },
builder: (context, state, child) { builder: (context, state, child) {
debugPrint("[NavigationsContainer] update===>");
WidgetsBinding.instance.addPostFrameCallback( WidgetsBinding.instance.addPostFrameCallback(
(_) { (_) {
context.appController.appState.navigationItems = globalState.appController.appState.navigationItems =
navigation.getItems( navigation.getItems(
openLogs: state.openLogs, openLogs: state.openLogs,
hasProxies: state.hasProxies, hasProxies: state.hasProxies,

View File

@@ -66,25 +66,25 @@ class CommonCard extends StatelessWidget {
final Widget child; final Widget child;
final Info? info; final Info? info;
BorderSide getBorderSide(BuildContext context, Set<MaterialState> states) { BorderSide getBorderSide(BuildContext context, Set<WidgetState> states) {
final colorScheme = Theme.of(context).colorScheme; final colorScheme = Theme.of(context).colorScheme;
var hoverColor = isSelected var hoverColor = isSelected
? colorScheme.primary.toLight() ? colorScheme.primary.toLight()
: colorScheme.primary.toLighter(); : colorScheme.primary.toLighter();
if (states.contains(MaterialState.hovered) || if (states.contains(WidgetState.hovered) ||
states.contains(MaterialState.focused) || states.contains(WidgetState.focused) ||
states.contains(MaterialState.pressed)) { states.contains(WidgetState.pressed)) {
return BorderSide( return BorderSide(
color: hoverColor, color: hoverColor,
); );
} }
return BorderSide( return BorderSide(
color: color:
isSelected ? colorScheme.primary : colorScheme.onBackground.toSoft(), isSelected ? colorScheme.primary : colorScheme.onSurface.toSoft(),
); );
} }
Color? getBackgroundColor(BuildContext context, Set<MaterialState> states) { Color? getBackgroundColor(BuildContext context, Set<WidgetState> states) {
final colorScheme = Theme.of(context).colorScheme; final colorScheme = Theme.of(context).colorScheme;
if (isSelected) { if (isSelected) {
return colorScheme.secondaryContainer; return colorScheme.secondaryContainer;
@@ -123,16 +123,16 @@ class CommonCard extends StatelessWidget {
return OutlinedButton( return OutlinedButton(
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,
style: ButtonStyle( style: ButtonStyle(
padding: const MaterialStatePropertyAll(EdgeInsets.zero), padding: const WidgetStatePropertyAll(EdgeInsets.zero),
shape: MaterialStatePropertyAll( shape: WidgetStatePropertyAll(
RoundedRectangleBorder( RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
), ),
), ),
backgroundColor: MaterialStateProperty.resolveWith( backgroundColor: WidgetStateProperty.resolveWith(
(states) => getBackgroundColor(context, states), (states) => getBackgroundColor(context, states),
), ),
side: MaterialStateProperty.resolveWith( side: WidgetStateProperty.resolveWith(
(states) => getBorderSide(context, states), (states) => getBorderSide(context, states),
), ),
), ),

View File

@@ -38,14 +38,22 @@ class _ClashMessageContainerState extends State<ClashMessageContainer>
@override @override
void onDelay(Delay delay) { void onDelay(Delay delay) {
context.appController.setDelay(delay); globalState.healthcheckLock = true;
final appController = globalState.appController;
appController.setDelay(delay);
globalState.healthcheckLockDebounce ??= debounce<Function()>(
() async {
globalState.healthcheckLock = false;
},
milliseconds: 5000,
);
globalState.healthcheckLockDebounce!();
super.onDelay(delay); super.onDelay(delay);
} }
@override @override
void onLog(Log log) { void onLog(Log log) {
debugPrint("$log"); globalState.appController.appState.addLog(log);
context.appController.appState.addLog(log);
super.onLog(log); super.onLog(log);
} }

View File

@@ -1,4 +1,4 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'card.dart'; import 'card.dart';
import 'grid.dart'; import 'grid.dart';
@@ -25,7 +25,7 @@ class ColorSchemeBox extends StatelessWidget {
); );
} else { } else {
return Theme.of(context).copyWith( return Theme.of(context).copyWith(
colorScheme: context.appController.appState.systemColorSchemes colorScheme: globalState.appController.appState.systemColorSchemes
.getSystemColorSchemeForBrightness(Theme.of(context).brightness), .getSystemColorSchemeForBrightness(Theme.of(context).brightness),
); );
} }

View File

@@ -1,6 +1,10 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/models/models.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/scaffold.dart'; import 'package:fl_clash/widgets/scaffold.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'side_sheet.dart'; import 'side_sheet.dart';
showExtendPage( showExtendPage(
@@ -16,34 +20,14 @@ showExtendPage(
key: globalKey, key: globalKey,
child: body, child: body,
); );
// Flexible(
// flex: 0,
// child: Row(
// children: [
// Expanded(
// child: Padding(
// padding: kTabLabelPadding,
// child: Text(
// title,
// style: Theme.of(context).textTheme.titleMedium,
// ),
// ),
// ),
// const SizedBox(
// height: kToolbarHeight,
// width: kToolbarHeight,
// child: CloseButton(),
// ),
// ],
// ),
// )
navigator.push( navigator.push(
ModalSideSheetRoute( ModalSideSheetRoute(
modalBarrierColor: Colors.black38, modalBarrierColor: Colors.black38,
builder: (context) => LayoutBuilder( builder: (context) => Selector<AppState, double>(
builder: (_, __) { selector: (_, appState) => appState.viewWidth,
final isMobile = context.isMobile; builder: (_, viewWidth, __) {
final isMobile =
globalState.appController.appState.viewMode == ViewMode.mobile;
final commonScaffold = CommonScaffold( final commonScaffold = CommonScaffold(
automaticallyImplyLeading: isMobile ? true : false, automaticallyImplyLeading: isMobile ? true : false,
actions: isMobile actions: isMobile
@@ -55,18 +39,18 @@ showExtendPage(
child: CloseButton(), child: CloseButton(),
), ),
], ],
title: Text(title), title: title,
body: uniqueBody, body: uniqueBody,
); );
return AnimatedContainer( return AnimatedContainer(
duration: kThemeAnimationDuration, duration: kThemeAnimationDuration,
width: isMobile ? context.width : extendPageWidth ?? 300, width: isMobile ? viewWidth : extendPageWidth ?? 300,
child: commonScaffold, child: commonScaffold,
); );
}, },
), ),
constraints: const BoxConstraints(), constraints: const BoxConstraints(),
filter: appConstant.filter, filter: filter,
), ),
); );
} }

View File

@@ -1,4 +1,5 @@
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/enum/enum.dart';
import 'package:fl_clash/state.dart';
import 'package:fl_clash/widgets/open_container.dart'; import 'package:fl_clash/widgets/open_container.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -56,10 +57,12 @@ class OpenDelegate extends Delegate {
class NextDelegate extends Delegate { class NextDelegate extends Delegate {
final Widget widget; final Widget widget;
final String title; final String title;
final double? extendPageWidth;
const NextDelegate({ const NextDelegate({
required this.title, required this.title,
required this.widget, required this.widget,
this.extendPageWidth,
}); });
} }
@@ -203,7 +206,7 @@ class ListItem<T> extends StatelessWidget {
return OpenContainer( return OpenContainer(
closedBuilder: (_, action) { closedBuilder: (_, action) {
openAction() { openAction() {
final isMobile = context.isMobile; final isMobile = globalState.appController.appState.viewMode == ViewMode.mobile;
if (!isMobile) { if (!isMobile) {
showExtendPage( showExtendPage(
context, context,
@@ -220,8 +223,9 @@ class ListItem<T> extends StatelessWidget {
}, },
openBuilder: (_, action) { openBuilder: (_, action) {
return CommonScaffold.open( return CommonScaffold.open(
key: Key(openDelegate.title),
onBack: action, onBack: action,
title: Text(openDelegate.title), title: openDelegate.title,
body: openDelegate.widget, body: openDelegate.widget,
); );
}, },
@@ -231,11 +235,22 @@ class ListItem<T> extends StatelessWidget {
final nextDelegate = delegate as NextDelegate; final nextDelegate = delegate as NextDelegate;
return _buildListTile( return _buildListTile(
onTab: () { onTab: () {
final isMobile = globalState.appController.appState.viewMode == ViewMode.mobile;
if (!isMobile) {
showExtendPage(
context,
body: nextDelegate.widget,
title: nextDelegate.title,
extendPageWidth: nextDelegate.extendPageWidth,
);
return;
}
Navigator.of(context).push( Navigator.of(context).push(
MaterialPageRoute( MaterialPageRoute(
builder: (context) => CommonScaffold( builder: (context) => CommonScaffold(
key: Key(nextDelegate.title),
body: nextDelegate.widget, body: nextDelegate.widget,
title: Text(nextDelegate.title), title: nextDelegate.title,
), ),
), ),
); );

View File

@@ -446,11 +446,10 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
return Selector<Config, ThemeMode>( return Selector<Config, ThemeMode>(
selector: (_, config) => config.themeMode, selector: (_, config) => config.themeMode,
builder: (_, __, ___) { builder: (_, __, ___) {
debugPrint("[OpenContainerTheme] update===>");
_colorTween = _getColorTween( _colorTween = _getColorTween(
transitionType: transitionType, transitionType: transitionType,
closedColor: Theme.of(context).colorScheme.background, closedColor: Theme.of(context).colorScheme.surface,
openColor: Theme.of(context).colorScheme.background, openColor: Theme.of(context).colorScheme.surface,
middleColor: middleColor, middleColor: middleColor,
); );
return Align( return Align(

View File

@@ -1,7 +1,7 @@
import 'dart:io'; import 'dart:io';
import 'package:fl_clash/common/common.dart'; import 'package:fl_clash/state.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
class PopContainer extends StatefulWidget { class PopContainer extends StatefulWidget {
@@ -24,7 +24,7 @@ class _PopContainerState extends State<PopContainer> {
if (canPop) { if (canPop) {
Navigator.pop(context); Navigator.pop(context);
} else { } else {
await context.appController.handleBackOrExit(); await globalState.appController.handleBackOrExit();
} }
}, },
child: widget.child, child: widget.child,

View File

@@ -1,10 +1,13 @@
import 'package:fl_clash/common/app_localizations.dart';
import 'package:fl_clash/common/system.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
class CommonScaffold extends StatefulWidget { class CommonScaffold extends StatefulWidget {
final Widget body; final Widget body;
final Widget? bottomNavigationBar; final Widget? bottomNavigationBar;
final Widget? title; final String title;
final Widget? leading; final Widget? leading;
final List<Widget>? actions; final List<Widget>? actions;
final bool automaticallyImplyLeading; final bool automaticallyImplyLeading;
@@ -14,7 +17,7 @@ class CommonScaffold extends StatefulWidget {
required this.body, required this.body,
this.bottomNavigationBar, this.bottomNavigationBar,
this.leading, this.leading,
this.title, required this.title,
this.actions, this.actions,
this.automaticallyImplyLeading = true, this.automaticallyImplyLeading = true,
}); });
@@ -22,7 +25,7 @@ class CommonScaffold extends StatefulWidget {
CommonScaffold.open({ CommonScaffold.open({
Key? key, Key? key,
required Widget body, required Widget body,
Widget? title, required String title,
required Function onBack, required Function onBack,
}) : this( }) : this(
key: key, key: key,
@@ -55,10 +58,26 @@ class CommonScaffoldState extends State<CommonScaffold> {
} }
} }
loadingRun(Future<void> Function() futureFunction) async { Future<T?> loadingRun<T>(
Future<T> Function() futureFunction, {
String? title,
}) async {
if (_loading.value == true) return null;
_loading.value = true; _loading.value = true;
await futureFunction(); try {
_loading.value = false; final res = await futureFunction();
_loading.value = false;
return res;
} catch (e) {
globalState.showMessage(
title: title ?? appLocalizations.tip,
message: TextSpan(
text: e.toString(),
),
);
_loading.value = false;
return null;
}
} }
@override @override
@@ -69,8 +88,10 @@ class CommonScaffoldState extends State<CommonScaffold> {
} }
} }
@override _platformContainer({required Widget child}) {
Widget build(BuildContext context) { if (system.isDesktop) {
return child;
}
return AnnotatedRegion( return AnnotatedRegion(
value: SystemUiOverlayStyle( value: SystemUiOverlayStyle(
statusBarColor: Colors.transparent, statusBarColor: Colors.transparent,
@@ -80,6 +101,13 @@ class CommonScaffoldState extends State<CommonScaffold> {
systemNavigationBarColor: Colors.transparent, systemNavigationBarColor: Colors.transparent,
systemNavigationBarDividerColor: Colors.transparent, systemNavigationBarDividerColor: Colors.transparent,
), ),
child: child,
);
}
@override
Widget build(BuildContext context) {
return _platformContainer(
child: Scaffold( child: Scaffold(
appBar: PreferredSize( appBar: PreferredSize(
preferredSize: const Size.fromHeight(kToolbarHeight), preferredSize: const Size.fromHeight(kToolbarHeight),
@@ -92,7 +120,7 @@ class CommonScaffoldState extends State<CommonScaffold> {
return AppBar( return AppBar(
automaticallyImplyLeading: widget.automaticallyImplyLeading, automaticallyImplyLeading: widget.automaticallyImplyLeading,
leading: widget.leading, leading: widget.leading,
title: widget.title, title: Text(widget.title),
actions: actions.isNotEmpty ? actions : widget.actions, actions: actions.isNotEmpty ? actions : widget.actions,
); );
}, },
@@ -114,3 +142,23 @@ class CommonScaffoldState extends State<CommonScaffold> {
); );
} }
} }
class AppIcon extends StatelessWidget {
const AppIcon({super.key});
@override
Widget build(BuildContext context) {
return Container(
margin: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 16,
),
width: 30,
height: 30,
child: const CircleAvatar(
foregroundImage: AssetImage("assets/images/launch_icon.png"),
backgroundColor: Colors.transparent,
),
);
}
}

37
lib/widgets/section.dart Normal file
View File

@@ -0,0 +1,37 @@
import 'package:flutter/material.dart';
class Section extends StatelessWidget {
final String title;
final Widget child;
const Section({
super.key,
required this.title,
required this.child,
});
@override
Widget build(BuildContext context) {
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Flexible(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
child: Text(
title,
style: Theme.of(context).textTheme.labelLarge?.copyWith(
color: Theme.of(context).colorScheme.primary,
),
),
),
),
Expanded(
flex: 0,
child: child,
)
],
);
}
}

View File

@@ -3,7 +3,7 @@ import 'package:flutter/rendering.dart';
const Duration _bottomSheetEnterDuration = Duration(milliseconds: 300); const Duration _bottomSheetEnterDuration = Duration(milliseconds: 300);
const Duration _bottomSheetExitDuration = Duration(milliseconds: 200); const Duration _bottomSheetExitDuration = Duration(milliseconds: 200);
const Curve _modalBottomSheetCurve = decelerateEasing; const Curve _modalBottomSheetCurve = Easing.standardDecelerate;
const double _defaultScrollControlDisabledMaxHeightRatio = 9.0 / 16.0; const double _defaultScrollControlDisabledMaxHeightRatio = 9.0 / 16.0;
class SideSheet extends StatefulWidget { class SideSheet extends StatefulWidget {

View File

@@ -1,6 +1,7 @@
import 'package:fl_clash/common/common.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../state.dart';
class TooltipText extends StatelessWidget { class TooltipText extends StatelessWidget {
final Text text; final Text text;
@@ -14,7 +15,7 @@ class TooltipText extends StatelessWidget {
return LayoutBuilder( return LayoutBuilder(
builder: (context, container) { builder: (context, container) {
final maxWidth = container.maxWidth; final maxWidth = container.maxWidth;
final size = context.appController.measure.computeTextSize( final size = globalState.appController.measure.computeTextSize(
text, text,
); );
if (maxWidth < size.width) { if (maxWidth < size.width) {

View File

@@ -1,5 +1,5 @@
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/plugins/tile.dart'; import 'package:fl_clash/plugins/tile.dart';
import 'package:fl_clash/state.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class TileContainer extends StatefulWidget { class TileContainer extends StatefulWidget {
@@ -24,13 +24,13 @@ class _TileContainerState extends State<TileContainer> with TileListener {
@override @override
void onStart() { void onStart() {
context.appController.updateSystemProxy(true); globalState.appController.updateSystemProxy(true);
super.onStart(); super.onStart();
} }
@override @override
void onStop() { void onStop() {
context.appController.updateSystemProxy(false); globalState.appController.updateSystemProxy(false);
super.onStop(); super.onStop();
} }

Some files were not shown because too many files have changed in this diff Show More