Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bb7e44da30 | ||
|
|
01f1b2d72f | ||
|
|
3074b1299e | ||
|
|
bd5470b863 | ||
|
|
83fafa4b68 | ||
|
|
b7fb969301 | ||
|
|
3ef3190785 | ||
|
|
b1c763fcfa | ||
|
|
9452ffa514 | ||
|
|
c9291e5027 | ||
|
|
3ba86dc9c2 | ||
|
|
fd3040283c |
674
LICENSE
Normal file
674
LICENSE
Normal 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>.
|
||||||
22
README.md
22
README.md
@@ -6,6 +6,14 @@
|
|||||||
|
|
||||||
## 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:
|
||||||
@@ -26,6 +34,8 @@ on Mobile:
|
|||||||
|
|
||||||
💡 Based on Material You Design, [Surfboard](https://github.com/getsurfboard/surfboard)-like UI
|
💡 Based on Material You Design, [Surfboard](https://github.com/getsurfboard/surfboard)-like UI
|
||||||
|
|
||||||
|
☁️ Supports data sync via WebDAV
|
||||||
|
|
||||||
✨ Support subscription link, Dark mode
|
✨ Support subscription link, Dark mode
|
||||||
|
|
||||||
## Contact
|
## Contact
|
||||||
@@ -88,4 +98,14 @@ on Mobile:
|
|||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## 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>
|
||||||
@@ -6,6 +6,14 @@
|
|||||||
|
|
||||||
## 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:
|
||||||
@@ -26,6 +34,8 @@ on Mobile:
|
|||||||
|
|
||||||
💡 基本 Material You 设计, 类[Surfboard](https://github.com/getsurfboard/surfboard)用户界面
|
💡 基本 Material You 设计, 类[Surfboard](https://github.com/getsurfboard/surfboard)用户界面
|
||||||
|
|
||||||
|
☁️ 支持通过WebDAV同步数据
|
||||||
|
|
||||||
✨ 支持一键导入订阅, 深色模式
|
✨ 支持一键导入订阅, 深色模式
|
||||||
|
|
||||||
## Contact
|
## Contact
|
||||||
@@ -85,4 +95,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>
|
||||||
@@ -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,6 +21,7 @@ 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() {
|
||||||
|
|
||||||
|
|
||||||
@@ -97,6 +99,43 @@ 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) {
|
||||||
@@ -104,42 +143,13 @@ class FlClashVpnService : VpnService() {
|
|||||||
NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
|
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 =
|
||||||
|
notificationBuilder.setContentTitle(title).setContentText(content).build()
|
||||||
val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
||||||
PendingIntent.getActivity(
|
startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
|
||||||
this,
|
} else {
|
||||||
0,
|
startForeground(notificationId, notification)
|
||||||
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)
|
|
||||||
|
|
||||||
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(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
|
|
||||||
} else {
|
|
||||||
startForeground(notificationId, notification)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
10
android/app/src/main/res/xml/network_security_config.xml
Normal file
10
android/app/src/main/res/xml/network_security_config.xml
Normal 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>
|
||||||
BIN
assets/data/ASN.mmdb
Normal file
BIN
assets/data/ASN.mmdb
Normal file
Binary file not shown.
31589
assets/data/GeoSite.dat
Normal file
31589
assets/data/GeoSite.dat
Normal file
File diff suppressed because one or more lines are too long
Binary file not shown.
Submodule core/Clash.Meta updated: 9b94b9c339...2cf9c4b120
@@ -22,6 +22,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
type healthCheckSchema struct {
|
type healthCheckSchema struct {
|
||||||
@@ -93,6 +94,13 @@ type Now struct {
|
|||||||
Value string `json:"value"`
|
Value string `json:"value"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type ExternalProvider struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Type string `json:"type"`
|
||||||
|
VehicleType string `json:"vehicle-type"`
|
||||||
|
UpdateAt time.Time `json:"update-at"`
|
||||||
|
}
|
||||||
|
|
||||||
func restartExecutable(execPath string) {
|
func restartExecutable(execPath string) {
|
||||||
var err error
|
var err error
|
||||||
executor.Shutdown()
|
executor.Shutdown()
|
||||||
|
|||||||
32
core/go.mod
32
core/go.mod
@@ -8,7 +8,7 @@ require (
|
|||||||
github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34
|
github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34
|
||||||
github.com/metacubex/mihomo v1.17.1
|
github.com/metacubex/mihomo v1.17.1
|
||||||
github.com/miekg/dns v1.1.59
|
github.com/miekg/dns v1.1.59
|
||||||
golang.org/x/net v0.24.0
|
golang.org/x/net v0.25.0
|
||||||
golang.org/x/sync v0.7.0
|
golang.org/x/sync v0.7.0
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@ require (
|
|||||||
github.com/bahlo/generic-list-go v0.2.0 // indirect
|
github.com/bahlo/generic-list-go v0.2.0 // indirect
|
||||||
github.com/buger/jsonparser v1.1.1 // indirect
|
github.com/buger/jsonparser v1.1.1 // indirect
|
||||||
github.com/cilium/ebpf v0.12.3 // indirect
|
github.com/cilium/ebpf v0.12.3 // indirect
|
||||||
github.com/cloudflare/circl v1.3.6 // indirect
|
github.com/cloudflare/circl v1.3.7 // indirect
|
||||||
github.com/coreos/go-iptables v0.7.0 // indirect
|
github.com/coreos/go-iptables v0.7.0 // indirect
|
||||||
github.com/dlclark/regexp2 v1.11.0 // indirect
|
github.com/dlclark/regexp2 v1.11.0 // indirect
|
||||||
github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // indirect
|
github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // indirect
|
||||||
@@ -34,8 +34,8 @@ require (
|
|||||||
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
|
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
|
||||||
github.com/gobwas/httphead v0.1.0 // indirect
|
github.com/gobwas/httphead v0.1.0 // indirect
|
||||||
github.com/gobwas/pool v0.2.1 // indirect
|
github.com/gobwas/pool v0.2.1 // indirect
|
||||||
github.com/gobwas/ws v1.3.2 // indirect
|
github.com/gobwas/ws v1.4.0 // indirect
|
||||||
github.com/gofrs/uuid/v5 v5.1.0 // indirect
|
github.com/gofrs/uuid/v5 v5.2.0 // indirect
|
||||||
github.com/google/btree v1.1.2 // indirect
|
github.com/google/btree v1.1.2 // indirect
|
||||||
github.com/google/go-cmp v0.6.0 // indirect
|
github.com/google/go-cmp v0.6.0 // indirect
|
||||||
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
|
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
|
||||||
@@ -51,14 +51,15 @@ require (
|
|||||||
github.com/mdlayher/socket v0.4.1 // indirect
|
github.com/mdlayher/socket v0.4.1 // indirect
|
||||||
github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
|
github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
|
||||||
github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec // indirect
|
github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec // indirect
|
||||||
github.com/metacubex/quic-go v0.42.1-0.20240418003344-f006b5735d98 // indirect
|
github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e // indirect
|
||||||
github.com/metacubex/sing-quic v0.0.0-20240418004036-814c531c378d // indirect
|
github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 // indirect
|
||||||
github.com/metacubex/sing-shadowsocks v0.2.6 // indirect
|
github.com/metacubex/sing-shadowsocks v0.2.6 // indirect
|
||||||
github.com/metacubex/sing-shadowsocks2 v0.2.0 // indirect
|
github.com/metacubex/sing-shadowsocks2 v0.2.0 // indirect
|
||||||
github.com/metacubex/sing-tun v0.2.6 // indirect
|
github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec // indirect
|
||||||
github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f // indirect
|
github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f // indirect
|
||||||
github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 // indirect
|
github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 // indirect
|
||||||
github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 // indirect
|
github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 // indirect
|
||||||
|
github.com/metacubex/utls v1.6.6 // indirect
|
||||||
github.com/mroth/weightedrand/v2 v2.1.0 // indirect
|
github.com/mroth/weightedrand/v2 v2.1.0 // indirect
|
||||||
github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
|
github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
|
||||||
github.com/onsi/ginkgo/v2 v2.9.5 // indirect
|
github.com/onsi/ginkgo/v2 v2.9.5 // indirect
|
||||||
@@ -75,10 +76,9 @@ require (
|
|||||||
github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 // indirect
|
github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 // indirect
|
||||||
github.com/sagernet/sing-shadowtls v0.1.4 // indirect
|
github.com/sagernet/sing-shadowtls v0.1.4 // indirect
|
||||||
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
|
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
|
||||||
github.com/sagernet/utls v1.5.4 // indirect
|
|
||||||
github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e // indirect
|
github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e // indirect
|
||||||
github.com/samber/lo v1.39.0 // indirect
|
github.com/samber/lo v1.39.0 // indirect
|
||||||
github.com/shirou/gopsutil/v3 v3.24.3 // indirect
|
github.com/shirou/gopsutil/v3 v3.24.4 // indirect
|
||||||
github.com/shoenig/go-m1cpu v0.1.6 // indirect
|
github.com/shoenig/go-m1cpu v0.1.6 // indirect
|
||||||
github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
|
github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
|
||||||
github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
|
github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
|
||||||
@@ -94,14 +94,14 @@ require (
|
|||||||
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
|
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
|
||||||
go.uber.org/mock v0.4.0 // indirect
|
go.uber.org/mock v0.4.0 // indirect
|
||||||
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
|
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
|
||||||
golang.org/x/crypto v0.22.0 // indirect
|
golang.org/x/crypto v0.23.0 // indirect
|
||||||
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
|
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
|
||||||
golang.org/x/mod v0.17.0 // indirect
|
golang.org/x/mod v0.17.0 // indirect
|
||||||
golang.org/x/sys v0.19.0 // indirect
|
golang.org/x/sys v0.20.0 // indirect
|
||||||
golang.org/x/text v0.14.0 // indirect
|
golang.org/x/text v0.15.0 // indirect
|
||||||
golang.org/x/time v0.5.0 // indirect
|
golang.org/x/time v0.5.0 // indirect
|
||||||
golang.org/x/tools v0.20.0 // indirect
|
golang.org/x/tools v0.21.0 // indirect
|
||||||
google.golang.org/protobuf v1.33.0 // indirect
|
google.golang.org/protobuf v1.34.1 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
lukechampine.com/blake3 v1.2.2 // indirect
|
lukechampine.com/blake3 v1.3.0 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
68
core/go.sum
68
core/go.sum
@@ -21,8 +21,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
|
|||||||
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
||||||
github.com/cilium/ebpf v0.12.3 h1:8ht6F9MquybnY97at+VDZb3eQQr8ev79RueWeVaEcG4=
|
github.com/cilium/ebpf v0.12.3 h1:8ht6F9MquybnY97at+VDZb3eQQr8ev79RueWeVaEcG4=
|
||||||
github.com/cilium/ebpf v0.12.3/go.mod h1:TctK1ivibvI3znr66ljgi4hqOT8EYQjz1KWBfb1UVgM=
|
github.com/cilium/ebpf v0.12.3/go.mod h1:TctK1ivibvI3znr66ljgi4hqOT8EYQjz1KWBfb1UVgM=
|
||||||
github.com/cloudflare/circl v1.3.6 h1:/xbKIqSHbZXHwkhbrhrt2YOHIwYJlXH94E3tI/gDlUg=
|
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
|
||||||
github.com/cloudflare/circl v1.3.6/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
|
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
|
||||||
github.com/coreos/go-iptables v0.7.0 h1:XWM3V+MPRr5/q51NuWSgU0fqMad64Zyxs8ZUoMsamr8=
|
github.com/coreos/go-iptables v0.7.0 h1:XWM3V+MPRr5/q51NuWSgU0fqMad64Zyxs8ZUoMsamr8=
|
||||||
github.com/coreos/go-iptables v0.7.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
|
github.com/coreos/go-iptables v0.7.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
@@ -57,10 +57,10 @@ github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU
|
|||||||
github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
|
github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
|
||||||
github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
|
github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
|
||||||
github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
|
github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
|
||||||
github.com/gobwas/ws v1.3.2 h1:zlnbNHxumkRvfPWgfXu8RBwyNR1x8wh9cf5PTOCqs9Q=
|
github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
|
||||||
github.com/gobwas/ws v1.3.2/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
|
github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
|
||||||
github.com/gofrs/uuid/v5 v5.1.0 h1:S5rqVKIigghZTCBKPCw0Y+bXkn26K3TB5mvQq2Ix8dk=
|
github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
|
||||||
github.com/gofrs/uuid/v5 v5.1.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
|
github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
|
||||||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||||
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
|
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
|
||||||
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
||||||
@@ -105,22 +105,24 @@ github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvO
|
|||||||
github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
|
github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
|
||||||
github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec h1:HxreOiFTUrJXJautEo8rnE1uKTVGY8wtZepY1Tii/Nc=
|
github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec h1:HxreOiFTUrJXJautEo8rnE1uKTVGY8wtZepY1Tii/Nc=
|
||||||
github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec/go.mod h1:8BVmQ+3cxjqzWElafm24rb2Ae4jRI6vAXNXWqWjfrXw=
|
github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec/go.mod h1:8BVmQ+3cxjqzWElafm24rb2Ae4jRI6vAXNXWqWjfrXw=
|
||||||
github.com/metacubex/quic-go v0.42.1-0.20240418003344-f006b5735d98 h1:oMLlJV4a9AylNo8ZLBNUiqZ02Vme6GLLHjuWJz8amSk=
|
github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e h1:Nzwe08FNIJpExWpy9iXkG336dN/8nJqn69yijB7vJ8g=
|
||||||
github.com/metacubex/quic-go v0.42.1-0.20240418003344-f006b5735d98/go.mod h1:iGx3Y1zynls/FjFgykLSqDcM81U0IKePRTXEz5g3iiQ=
|
github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e/go.mod h1:uXHODgJFUfUnkkCMWLd5Er6L5QY/LFRZb9LD5jyyhsk=
|
||||||
github.com/metacubex/sing-quic v0.0.0-20240418004036-814c531c378d h1:RAe0ND8J5SOPGI623oEXfaHKaaUrrzHx+U1DN9Awcco=
|
github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 h1:Wr4g1HCb5Z/QIFwFiVNjO2qL+dRu25+Mdn9xtAZZ+ew=
|
||||||
github.com/metacubex/sing-quic v0.0.0-20240418004036-814c531c378d/go.mod h1:WyY0zYxv+o+18R/Ece+QFontlgXoobKbNqbtYn2zjz8=
|
github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
|
||||||
github.com/metacubex/sing-shadowsocks v0.2.6 h1:6oEB3QcsFYnNiFeoevcXrCwJ3sAablwVSgtE9R3QeFQ=
|
github.com/metacubex/sing-shadowsocks v0.2.6 h1:6oEB3QcsFYnNiFeoevcXrCwJ3sAablwVSgtE9R3QeFQ=
|
||||||
github.com/metacubex/sing-shadowsocks v0.2.6/go.mod h1:zIkMeSnb8Mbf4hdqhw0pjzkn1d99YJ3JQm/VBg5WMTg=
|
github.com/metacubex/sing-shadowsocks v0.2.6/go.mod h1:zIkMeSnb8Mbf4hdqhw0pjzkn1d99YJ3JQm/VBg5WMTg=
|
||||||
github.com/metacubex/sing-shadowsocks2 v0.2.0 h1:hqwT/AfI5d5UdPefIzR6onGHJfDXs5zgOM5QSgaM/9A=
|
github.com/metacubex/sing-shadowsocks2 v0.2.0 h1:hqwT/AfI5d5UdPefIzR6onGHJfDXs5zgOM5QSgaM/9A=
|
||||||
github.com/metacubex/sing-shadowsocks2 v0.2.0/go.mod h1:LCKF6j1P94zN8ZS+LXRK1gmYTVGB3squivBSXAFnOg8=
|
github.com/metacubex/sing-shadowsocks2 v0.2.0/go.mod h1:LCKF6j1P94zN8ZS+LXRK1gmYTVGB3squivBSXAFnOg8=
|
||||||
github.com/metacubex/sing-tun v0.2.6 h1:frc58BqnIClqcC9KcYBfVAn5bgO6WW1ANKvZW3/HYAQ=
|
github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec h1:K4Wq3GOdLZ/xcqwyzAt4kmYQrjokyKQ3u/Xh5Yft14U=
|
||||||
github.com/metacubex/sing-tun v0.2.6/go.mod h1:4VsMwZH1IlgPGFK1ZbBomZ/B2MYkTgs2+gnBAr5GOIo=
|
github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec/go.mod h1:4VsMwZH1IlgPGFK1ZbBomZ/B2MYkTgs2+gnBAr5GOIo=
|
||||||
github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f h1:QjXrHKbTMBip/C+R79bvbfr42xH1gZl3uFb0RELdZiQ=
|
github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f h1:QjXrHKbTMBip/C+R79bvbfr42xH1gZl3uFb0RELdZiQ=
|
||||||
github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
|
github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
|
||||||
github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 h1:AGyIB55UfQm/0ZH0HtQO9u3l//yjtHUpjeRjjPGfGRI=
|
github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 h1:AGyIB55UfQm/0ZH0HtQO9u3l//yjtHUpjeRjjPGfGRI=
|
||||||
github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
|
github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
|
||||||
github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 h1:as/aO/fM8nv4W4pOr9EETP6kV/Oaujk3fUNyQSJK61c=
|
github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 h1:as/aO/fM8nv4W4pOr9EETP6kV/Oaujk3fUNyQSJK61c=
|
||||||
github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66/go.mod h1:c7bVFM9f5+VzeZ/6Kg77T/jrg1Xp8QpqlSHvG/aXVts=
|
github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66/go.mod h1:c7bVFM9f5+VzeZ/6Kg77T/jrg1Xp8QpqlSHvG/aXVts=
|
||||||
|
github.com/metacubex/utls v1.6.6 h1:3D12YKHTf2Z41UPhQU2dWerNWJ5TVQD9gKoQ+H+iLC8=
|
||||||
|
github.com/metacubex/utls v1.6.6/go.mod h1:+WLFUnXjcpdxXCnyX25nggw8C6YonZ8zOK2Zm/oRvdo=
|
||||||
github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
|
github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
|
||||||
github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
|
github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
|
||||||
github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
|
github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
|
||||||
@@ -166,14 +168,12 @@ github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnV
|
|||||||
github.com/sagernet/sing-shadowtls v0.1.4/go.mod h1:F8NBgsY5YN2beQavdgdm1DPlhaKQlaL6lpDdcBglGK4=
|
github.com/sagernet/sing-shadowtls v0.1.4/go.mod h1:F8NBgsY5YN2beQavdgdm1DPlhaKQlaL6lpDdcBglGK4=
|
||||||
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxeq2z31Fpv8CQqqrUwTbrIRumZqQ=
|
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxeq2z31Fpv8CQqqrUwTbrIRumZqQ=
|
||||||
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7/go.mod h1:FP9X2xjT/Az1EsG/orYYoC+5MojWnuI7hrffz8fGwwo=
|
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7/go.mod h1:FP9X2xjT/Az1EsG/orYYoC+5MojWnuI7hrffz8fGwwo=
|
||||||
github.com/sagernet/utls v1.5.4 h1:KmsEGbB2dKUtCNC+44NwAdNAqnqQ6GA4pTO0Yik56co=
|
|
||||||
github.com/sagernet/utls v1.5.4/go.mod h1:CTGxPWExIloRipK3XFpYv0OVyhO8kk3XCGW/ieyTh1s=
|
|
||||||
github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e h1:iGH0RMv2FzELOFNFQtvsxH7NPmlo7X5JizEK51UCojo=
|
github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e h1:iGH0RMv2FzELOFNFQtvsxH7NPmlo7X5JizEK51UCojo=
|
||||||
github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e/go.mod h1:YbL4TKHRR6APYQv3U2RGfwLDpPYSyWz6oUlpISBEzBE=
|
github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e/go.mod h1:YbL4TKHRR6APYQv3U2RGfwLDpPYSyWz6oUlpISBEzBE=
|
||||||
github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
|
github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
|
||||||
github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
|
github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
|
||||||
github.com/shirou/gopsutil/v3 v3.24.3 h1:eoUGJSmdfLzJ3mxIhmOAhgKEKgQkeOwKpz1NbhVnuPE=
|
github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU=
|
||||||
github.com/shirou/gopsutil/v3 v3.24.3/go.mod h1:JpND7O217xa72ewWz9zN2eIIkPWsDN/3pl0H8Qt0uwg=
|
github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8=
|
||||||
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
|
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
|
||||||
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
|
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
|
||||||
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
|
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
|
||||||
@@ -223,18 +223,18 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBs
|
|||||||
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
|
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
|
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
|
||||||
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
|
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
|
||||||
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY=
|
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
|
||||||
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
|
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
|
||||||
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
|
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
|
||||||
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
||||||
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
|
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
|
||||||
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
|
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
|
||||||
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
|
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
|
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
|
||||||
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||||
@@ -254,28 +254,28 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|||||||
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
|
||||||
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
|
|
||||||
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
|
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
|
||||||
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
|
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
|
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
|
||||||
|
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
|
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
|
||||||
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||||
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
|
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
|
||||||
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
|
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
|
||||||
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||||
golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
|
golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
|
||||||
golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
|
golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
|
||||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
|
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
|
||||||
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
|
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
|
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
|
||||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
lukechampine.com/blake3 v1.2.2 h1:wEAbSg0IVU4ih44CVlpMqMZMpzr5hf/6aqodLlevd/w=
|
lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
|
||||||
lukechampine.com/blake3 v1.2.2/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
|
lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
|
||||||
|
|||||||
101
core/hub.go
101
core/hub.go
@@ -10,10 +10,13 @@ import (
|
|||||||
"github.com/metacubex/mihomo/adapter/provider"
|
"github.com/metacubex/mihomo/adapter/provider"
|
||||||
"github.com/metacubex/mihomo/common/structure"
|
"github.com/metacubex/mihomo/common/structure"
|
||||||
"github.com/metacubex/mihomo/common/utils"
|
"github.com/metacubex/mihomo/common/utils"
|
||||||
|
"github.com/metacubex/mihomo/component/mmdb"
|
||||||
"github.com/metacubex/mihomo/config"
|
"github.com/metacubex/mihomo/config"
|
||||||
"github.com/metacubex/mihomo/constant"
|
"github.com/metacubex/mihomo/constant"
|
||||||
|
cp "github.com/metacubex/mihomo/constant/provider"
|
||||||
"github.com/metacubex/mihomo/hub/executor"
|
"github.com/metacubex/mihomo/hub/executor"
|
||||||
"github.com/metacubex/mihomo/log"
|
"github.com/metacubex/mihomo/log"
|
||||||
|
rp "github.com/metacubex/mihomo/rules/provider"
|
||||||
"github.com/metacubex/mihomo/tunnel"
|
"github.com/metacubex/mihomo/tunnel"
|
||||||
"github.com/metacubex/mihomo/tunnel/statistic"
|
"github.com/metacubex/mihomo/tunnel/statistic"
|
||||||
"golang.org/x/net/context"
|
"golang.org/x/net/context"
|
||||||
@@ -58,10 +61,22 @@ func shutdownClash() bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//export validateConfig
|
//export validateConfig
|
||||||
func validateConfig(s *C.char) bool {
|
func validateConfig(s *C.char, port C.longlong) {
|
||||||
bytes := []byte(C.GoString(s))
|
i := int64(port)
|
||||||
_, err := config.UnmarshalRawConfig(bytes)
|
go func() {
|
||||||
return err == nil
|
bytes := []byte(C.GoString(s))
|
||||||
|
rawConfig, err := config.UnmarshalRawConfig(bytes)
|
||||||
|
if err != nil {
|
||||||
|
bridge.SendToPort(i, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_, err = config.ParseRawConfig(rawConfig)
|
||||||
|
if err != nil {
|
||||||
|
bridge.SendToPort(i, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
bridge.SendToPort(i, "")
|
||||||
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
//export updateConfig
|
//export updateConfig
|
||||||
@@ -286,6 +301,84 @@ func getProvider(name *C.char) *C.char {
|
|||||||
return C.CString(string(data))
|
return C.CString(string(data))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//export getExternalProviders
|
||||||
|
func getExternalProviders() *C.char {
|
||||||
|
externalProviders := make([]ExternalProvider, 0)
|
||||||
|
providers := tunnel.Providers()
|
||||||
|
for n, p := range providers {
|
||||||
|
if p.VehicleType() != cp.Compatible {
|
||||||
|
p := p.(*provider.ProxySetProvider)
|
||||||
|
externalProviders = append(externalProviders, ExternalProvider{
|
||||||
|
Name: n,
|
||||||
|
Type: p.Type().String(),
|
||||||
|
VehicleType: p.VehicleType().String(),
|
||||||
|
UpdateAt: p.UpdatedAt,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for n, p := range tunnel.RuleProviders() {
|
||||||
|
if p.VehicleType() != cp.Compatible {
|
||||||
|
p := p.(*rp.RuleSetProvider)
|
||||||
|
externalProviders = append(externalProviders, ExternalProvider{
|
||||||
|
Name: n,
|
||||||
|
Type: p.Type().String(),
|
||||||
|
VehicleType: p.VehicleType().String(),
|
||||||
|
UpdateAt: p.UpdatedAt,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
data, err := json.Marshal(externalProviders)
|
||||||
|
if err != nil {
|
||||||
|
return C.CString("")
|
||||||
|
}
|
||||||
|
return C.CString(string(data))
|
||||||
|
}
|
||||||
|
|
||||||
|
//export updateExternalProvider
|
||||||
|
func updateExternalProvider(providerName *C.char, providerType *C.char, port C.longlong) {
|
||||||
|
i := int64(port)
|
||||||
|
go func() {
|
||||||
|
providerNameString := C.GoString(providerName)
|
||||||
|
providerTypeString := C.GoString(providerType)
|
||||||
|
|
||||||
|
switch providerTypeString {
|
||||||
|
case "Proxy":
|
||||||
|
providers := tunnel.Providers()
|
||||||
|
err := providers[providerNameString].Update()
|
||||||
|
if err != nil {
|
||||||
|
bridge.SendToPort(i, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
case "Rule":
|
||||||
|
providers := tunnel.RuleProviders()
|
||||||
|
err := providers[providerNameString].Update()
|
||||||
|
if err != nil {
|
||||||
|
bridge.SendToPort(i, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
case "GeoIp":
|
||||||
|
err := mmdb.DownloadMMDB(constant.Path.Resolve(providerNameString))
|
||||||
|
if err != nil {
|
||||||
|
bridge.SendToPort(i, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
case "GeoSite":
|
||||||
|
err := mmdb.DownloadGeoSite(constant.Path.Resolve(providerNameString))
|
||||||
|
if err != nil {
|
||||||
|
bridge.SendToPort(i, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
case "ASN":
|
||||||
|
err := mmdb.DownloadASN(constant.Path.Resolve(providerNameString))
|
||||||
|
if err != nil {
|
||||||
|
bridge.SendToPort(i, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
bridge.SendToPort(i, "")
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
//export healthcheck
|
//export healthcheck
|
||||||
func healthcheck() {
|
func healthcheck() {
|
||||||
hcCompatibleProvider(tunnel.Providers())
|
hcCompatibleProvider(tunnel.Providers())
|
||||||
|
|||||||
@@ -82,7 +82,6 @@ class ApplicationState extends State<Application> {
|
|||||||
super.initState();
|
super.initState();
|
||||||
globalState.appController = AppController(context);
|
globalState.appController = AppController(context);
|
||||||
WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
|
WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
|
||||||
globalState.appController.updateViewWidth();
|
|
||||||
globalState.appController.afterInit();
|
globalState.appController.afterInit();
|
||||||
globalState.appController.initLink();
|
globalState.appController.initLink();
|
||||||
_updateGroups();
|
_updateGroups();
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ import 'dart:io';
|
|||||||
import 'dart:isolate';
|
import 'dart:isolate';
|
||||||
|
|
||||||
import 'package:ffi/ffi.dart';
|
import 'package:ffi/ffi.dart';
|
||||||
import '../enum/enum.dart';
|
import 'package:fl_clash/common/common.dart';
|
||||||
import '../models/models.dart';
|
import 'package:fl_clash/enum/enum.dart';
|
||||||
import '../common/common.dart';
|
import 'package:fl_clash/models/models.dart';
|
||||||
import 'generated/clash_ffi.dart';
|
import 'generated/clash_ffi.dart';
|
||||||
|
|
||||||
class ClashCore {
|
class ClashCore {
|
||||||
@@ -58,11 +58,20 @@ class ClashCore {
|
|||||||
|
|
||||||
bool get isInit => clashFFI.getIsInit() == 1;
|
bool get isInit => clashFFI.getIsInit() == 1;
|
||||||
|
|
||||||
bool validateConfig(String data) {
|
Future<String> validateConfig(String data) {
|
||||||
return clashFFI.validateConfig(
|
final completer = Completer<String>();
|
||||||
data.toNativeUtf8().cast(),
|
final receiver = ReceivePort();
|
||||||
) ==
|
receiver.listen((message) {
|
||||||
1;
|
if (!completer.isCompleted) {
|
||||||
|
completer.complete(message);
|
||||||
|
receiver.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
clashFFI.validateConfig(
|
||||||
|
data.toNativeUtf8().cast(),
|
||||||
|
receiver.sendPort.nativePort,
|
||||||
|
);
|
||||||
|
return completer.future;
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<String> updateConfig(UpdateConfigParams updateConfigParams) {
|
Future<String> updateConfig(UpdateConfigParams updateConfigParams) {
|
||||||
@@ -107,31 +116,41 @@ class ClashCore {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<DelayMap> getDelayMap() {
|
Future<List<ExternalProvider>> getExternalProviders() {
|
||||||
final proxiesRaw = clashFFI.getProxies();
|
final externalProvidersRaw = clashFFI.getExternalProviders();
|
||||||
final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
|
final externalProvidersRawString =
|
||||||
return Isolate.run<DelayMap>(() {
|
externalProvidersRaw.cast<Utf8>().toDartString();
|
||||||
final proxies = json.decode(proxiesRawString) as Map<String, dynamic>;
|
return Isolate.run<List<ExternalProvider>>(() {
|
||||||
return proxies.map<String, int?>(
|
final externalProviders =
|
||||||
(k, v) {
|
(json.decode(externalProvidersRawString) as List<dynamic>)
|
||||||
final history = v["history"] as List<dynamic>;
|
.map(
|
||||||
if (history.isEmpty) {
|
(item) => ExternalProvider.fromJson(item),
|
||||||
return MapEntry(
|
)
|
||||||
k,
|
.toList();
|
||||||
null,
|
return externalProviders;
|
||||||
);
|
|
||||||
} else {
|
|
||||||
final delay = history.last["delay"];
|
|
||||||
return MapEntry(
|
|
||||||
k,
|
|
||||||
delay != 0 ? delay : -1,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<String> updateExternalProvider({
|
||||||
|
required String providerName,
|
||||||
|
required String providerType,
|
||||||
|
}) {
|
||||||
|
final completer = Completer<String>();
|
||||||
|
final receiver = ReceivePort();
|
||||||
|
receiver.listen((message) {
|
||||||
|
if (!completer.isCompleted) {
|
||||||
|
completer.complete(message);
|
||||||
|
receiver.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
clashFFI.updateExternalProvider(
|
||||||
|
providerName.toNativeUtf8().cast(),
|
||||||
|
providerType.toNativeUtf8().cast(),
|
||||||
|
receiver.sendPort.nativePort,
|
||||||
|
);
|
||||||
|
return completer.future;
|
||||||
|
}
|
||||||
|
|
||||||
bool changeProxy(ChangeProxyParams changeProxyParams) {
|
bool changeProxy(ChangeProxyParams changeProxyParams) {
|
||||||
final params = json.encode(changeProxyParams);
|
final params = json.encode(changeProxyParams);
|
||||||
return clashFFI.changeProxy(params.toNativeUtf8().cast()) == 1;
|
return clashFFI.changeProxy(params.toNativeUtf8().cast()) == 1;
|
||||||
|
|||||||
@@ -893,19 +893,22 @@ class ClashFFI {
|
|||||||
_lookup<ffi.NativeFunction<GoUint8 Function()>>('shutdownClash');
|
_lookup<ffi.NativeFunction<GoUint8 Function()>>('shutdownClash');
|
||||||
late final _shutdownClash = _shutdownClashPtr.asFunction<int Function()>();
|
late final _shutdownClash = _shutdownClashPtr.asFunction<int Function()>();
|
||||||
|
|
||||||
int validateConfig(
|
void validateConfig(
|
||||||
ffi.Pointer<ffi.Char> s,
|
ffi.Pointer<ffi.Char> s,
|
||||||
|
int port,
|
||||||
) {
|
) {
|
||||||
return _validateConfig(
|
return _validateConfig(
|
||||||
s,
|
s,
|
||||||
|
port,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
late final _validateConfigPtr =
|
late final _validateConfigPtr = _lookup<
|
||||||
_lookup<ffi.NativeFunction<GoUint8 Function(ffi.Pointer<ffi.Char>)>>(
|
ffi.NativeFunction<
|
||||||
'validateConfig');
|
ffi.Void Function(
|
||||||
late final _validateConfig =
|
ffi.Pointer<ffi.Char>, ffi.LongLong)>>('validateConfig');
|
||||||
_validateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>();
|
late final _validateConfig = _validateConfigPtr
|
||||||
|
.asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
|
||||||
|
|
||||||
void updateConfig(
|
void updateConfig(
|
||||||
ffi.Pointer<ffi.Char> s,
|
ffi.Pointer<ffi.Char> s,
|
||||||
@@ -1054,6 +1057,35 @@ 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>)>();
|
||||||
|
|
||||||
|
ffi.Pointer<ffi.Char> getExternalProviders() {
|
||||||
|
return _getExternalProviders();
|
||||||
|
}
|
||||||
|
|
||||||
|
late final _getExternalProvidersPtr =
|
||||||
|
_lookup<ffi.NativeFunction<ffi.Pointer<ffi.Char> Function()>>(
|
||||||
|
'getExternalProviders');
|
||||||
|
late final _getExternalProviders =
|
||||||
|
_getExternalProvidersPtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
|
||||||
|
|
||||||
|
void updateExternalProvider(
|
||||||
|
ffi.Pointer<ffi.Char> providerName,
|
||||||
|
ffi.Pointer<ffi.Char> providerType,
|
||||||
|
int port,
|
||||||
|
) {
|
||||||
|
return _updateExternalProvider(
|
||||||
|
providerName,
|
||||||
|
providerType,
|
||||||
|
port,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
late final _updateExternalProviderPtr = _lookup<
|
||||||
|
ffi.NativeFunction<
|
||||||
|
ffi.Void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>,
|
||||||
|
ffi.LongLong)>>('updateExternalProvider');
|
||||||
|
late final _updateExternalProvider = _updateExternalProviderPtr.asFunction<
|
||||||
|
void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>, int)>();
|
||||||
|
|
||||||
void healthcheck() {
|
void healthcheck() {
|
||||||
return _healthcheck();
|
return _healthcheck();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,24 +1,41 @@
|
|||||||
import 'dart:io';
|
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/cupertino.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:path/path.dart';
|
||||||
|
|
||||||
import 'core.dart';
|
import 'core.dart';
|
||||||
|
|
||||||
class ClashService {
|
class ClashService {
|
||||||
Future<bool> initMmdb() async {
|
Future<void> initGeo() async {
|
||||||
final mmdbPath = await appPath.getMMDBPath();
|
final homePath = await appPath.getHomeDirPath();
|
||||||
var mmdbFile = File(mmdbPath);
|
final homeDir = Directory(homePath);
|
||||||
final isExists = await mmdbFile.exists();
|
final isExists = await homeDir.exists();
|
||||||
if (isExists) return true;
|
if (!isExists) {
|
||||||
|
await homeDir.create(recursive: true);
|
||||||
|
}
|
||||||
|
const geoFileNameList = [
|
||||||
|
mmdbFileName,
|
||||||
|
geoSiteFileName,
|
||||||
|
asnFileName,
|
||||||
|
];
|
||||||
try {
|
try {
|
||||||
mmdbFile = await mmdbFile.create(recursive: true);
|
for (final geoFileName in geoFileNameList) {
|
||||||
ByteData data = await rootBundle.load('assets/data/geoip.metadb');
|
final geoFile = File(
|
||||||
List<int> bytes = data.buffer.asUint8List();
|
join(homePath, geoFileName),
|
||||||
await mmdbFile.writeAsBytes(bytes, flush: true);
|
);
|
||||||
return true;
|
final isExists = await geoFile.exists();
|
||||||
} catch (_) {
|
if (isExists) {
|
||||||
return false;
|
continue;
|
||||||
|
}
|
||||||
|
final data = await rootBundle.load('assets/data/$geoFileName');
|
||||||
|
List<int> bytes = data.buffer.asUint8List();
|
||||||
|
await geoFile.writeAsBytes(bytes, flush: true);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint("$e");
|
||||||
|
exit(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -26,8 +43,7 @@ class ClashService {
|
|||||||
required ClashConfig clashConfig,
|
required ClashConfig clashConfig,
|
||||||
required Config config,
|
required Config config,
|
||||||
}) async {
|
}) async {
|
||||||
final isInitMmdb = await initMmdb();
|
await initGeo();
|
||||||
if (!isInitMmdb) return false;
|
|
||||||
final homeDirPath = await appPath.getHomeDirPath();
|
final homeDirPath = await appPath.getHomeDirPath();
|
||||||
final isInit = clashCore.init(homeDirPath);
|
final isInit = clashCore.init(homeDirPath);
|
||||||
return isInit;
|
return isInit;
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ const httpTimeoutDuration = Duration(milliseconds: 5000);
|
|||||||
const moreDuration = Duration(milliseconds: 100);
|
const moreDuration = Duration(milliseconds: 100);
|
||||||
const defaultUpdateDuration = Duration(days: 1);
|
const defaultUpdateDuration = Duration(days: 1);
|
||||||
const mmdbFileName = "geoip.metadb";
|
const mmdbFileName = "geoip.metadb";
|
||||||
|
const geoSiteFileName = "GeoSite.dat";
|
||||||
|
const asnFileName = "ASN.mmdb";
|
||||||
const profilesDirectoryName = "profiles";
|
const profilesDirectoryName = "profiles";
|
||||||
const localhost = "127.0.0.1";
|
const localhost = "127.0.0.1";
|
||||||
const clashConfigKey = "clash_config";
|
const clashConfigKey = "clash_config";
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
|
import 'package:fl_clash/common/app_localizations.dart';
|
||||||
|
|
||||||
extension DateTimeExtension on DateTime {
|
extension DateTimeExtension on DateTime {
|
||||||
bool isBeforeNow() {
|
bool get isBeforeNow {
|
||||||
return isBefore(DateTime.now());
|
return isBefore(DateTime.now());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -9,4 +11,28 @@ extension DateTimeExtension on DateTime {
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String get lastUpdateTimeDesc {
|
||||||
|
final currentDateTime = DateTime.now();
|
||||||
|
final difference = currentDateTime.difference(this);
|
||||||
|
final days = difference.inDays;
|
||||||
|
if (days >= 365) {
|
||||||
|
return "${(days / 365).floor()} ${appLocalizations.years}${appLocalizations.ago}";
|
||||||
|
}
|
||||||
|
if (days >= 30) {
|
||||||
|
return "${(days / 30).floor()} ${appLocalizations.months}${appLocalizations.ago}";
|
||||||
|
}
|
||||||
|
if (days >= 1) {
|
||||||
|
return "$days ${appLocalizations.days}${appLocalizations.ago}";
|
||||||
|
}
|
||||||
|
final hours = difference.inHours;
|
||||||
|
if (hours >= 1) {
|
||||||
|
return "$hours ${appLocalizations.hours}${appLocalizations.ago}";
|
||||||
|
}
|
||||||
|
final minutes = difference.inMinutes;
|
||||||
|
if (minutes >= 1) {
|
||||||
|
return "$minutes ${appLocalizations.minutes}${appLocalizations.ago}";
|
||||||
|
}
|
||||||
|
return appLocalizations.just;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -29,6 +29,14 @@ class Navigation {
|
|||||||
label: "profiles",
|
label: "profiles",
|
||||||
fragment: ProfilesFragment(),
|
fragment: ProfilesFragment(),
|
||||||
),
|
),
|
||||||
|
const NavigationItem(
|
||||||
|
icon: Icon(Icons.swap_vert_circle),
|
||||||
|
label: "resources",
|
||||||
|
description: "resourcesDesc",
|
||||||
|
keep: false,
|
||||||
|
fragment: Resources(),
|
||||||
|
modes: [NavigationItemMode.desktop, NavigationItemMode.more],
|
||||||
|
),
|
||||||
NavigationItem(
|
NavigationItem(
|
||||||
icon: const Icon(Icons.adb),
|
icon: const Icon(Icons.adb),
|
||||||
label: "logs",
|
label: "logs",
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ import 'dart:io';
|
|||||||
import 'dart:isolate';
|
import 'dart:isolate';
|
||||||
import 'dart:typed_data';
|
import 'dart:typed_data';
|
||||||
|
|
||||||
|
import 'package:fl_clash/common/constant.dart';
|
||||||
|
import 'package:fl_clash/enum/enum.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:zxing2/qrcode.dart';
|
import 'package:zxing2/qrcode.dart';
|
||||||
import 'package:image/image.dart' as img;
|
import 'package:image/image.dart' as img;
|
||||||
@@ -162,11 +164,28 @@ class Other {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
double getViewWidth(){
|
double getViewWidth() {
|
||||||
final view = WidgetsBinding.instance.platformDispatcher.views.first;
|
final view = WidgetsBinding.instance.platformDispatcher.views.first;
|
||||||
final size = view.physicalSize / view.devicePixelRatio;
|
final size = view.physicalSize / view.devicePixelRatio;
|
||||||
return size.width;
|
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();
|
||||||
|
}
|
||||||
|
|
||||||
|
ViewMode getViewMode(double viewWidth){
|
||||||
|
if (viewWidth <= maxMobileWidth) return ViewMode.mobile;
|
||||||
|
if (viewWidth <= maxLaptopWidth) return ViewMode.laptop;
|
||||||
|
return ViewMode.desktop;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
final other = Other();
|
final other = Other();
|
||||||
|
|||||||
@@ -36,11 +36,6 @@ class AppPath {
|
|||||||
final directory = await getProfilesPath();
|
final directory = await getProfilesPath();
|
||||||
return join(directory, "$id.yaml");
|
return join(directory, "$id.yaml");
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<String> getMMDBPath() async {
|
|
||||||
var directory = await applicationSupportDirectoryCompleter.future;
|
|
||||||
return join(directory.path, mmdbFileName);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
final appPath = AppPath();
|
final appPath = AppPath();
|
||||||
|
|||||||
@@ -3,10 +3,9 @@ import 'dart:io';
|
|||||||
import 'package:file_picker/file_picker.dart';
|
import 'package:file_picker/file_picker.dart';
|
||||||
import 'package:fl_clash/common/common.dart';
|
import 'package:fl_clash/common/common.dart';
|
||||||
import 'package:image_picker/image_picker.dart';
|
import 'package:image_picker/image_picker.dart';
|
||||||
import 'package:fl_clash/models/models.dart';
|
|
||||||
|
|
||||||
class Picker {
|
class Picker {
|
||||||
Future<Result<PlatformFile>> pickerConfigFile() async {
|
Future<PlatformFile?> pickerConfigFile() async {
|
||||||
FilePickerResult? filePickerResult;
|
FilePickerResult? filePickerResult;
|
||||||
if (Platform.isAndroid) {
|
if (Platform.isAndroid) {
|
||||||
filePickerResult = await FilePicker.platform.pickFiles(
|
filePickerResult = await FilePicker.platform.pickFiles(
|
||||||
@@ -23,20 +22,20 @@ class Picker {
|
|||||||
}
|
}
|
||||||
final file = filePickerResult?.files.first;
|
final file = filePickerResult?.files.first;
|
||||||
if (file == null) {
|
if (file == null) {
|
||||||
return Result.error(appLocalizations.pleaseUploadFile);
|
return null;
|
||||||
}
|
}
|
||||||
return Result.success(file);
|
return file;
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<Result<String>> pickerConfigQRCode() async {
|
Future<String?> pickerConfigQRCode() async {
|
||||||
final xFile = await ImagePicker().pickImage(source: ImageSource.gallery);
|
final xFile = await ImagePicker().pickImage(source: ImageSource.gallery);
|
||||||
final bytes = await xFile?.readAsBytes();
|
final bytes = await xFile?.readAsBytes();
|
||||||
if (bytes == null) return Result.error();
|
if (bytes == null) return null;
|
||||||
final result = await other.parseQRCode(bytes);
|
final result = await other.parseQRCode(bytes);
|
||||||
if (result == null || !result.isUrl) {
|
if (result == null || !result.isUrl) {
|
||||||
return Result.error(appLocalizations.pleaseUploadValidQrcode);
|
throw appLocalizations.pleaseUploadValidQrcode;
|
||||||
}
|
}
|
||||||
return Result.success(result);
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ class ProxyManager {
|
|||||||
_proxy = proxy ?? proxy_plugin.Proxy();
|
_proxy = proxy ?? proxy_plugin.Proxy();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool get isStart => startTime != null && startTime!.isBeforeNow();
|
bool get isStart => startTime != null && startTime!.isBeforeNow;
|
||||||
|
|
||||||
DateTime? get startTime => _proxy.startTime;
|
DateTime? get startTime => _proxy.startTime;
|
||||||
|
|
||||||
|
|||||||
@@ -1,36 +1,78 @@
|
|||||||
import 'dart:convert';
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:dio/dio.dart';
|
||||||
|
import 'package:dio/io.dart';
|
||||||
import 'package:fl_clash/common/common.dart';
|
import 'package:fl_clash/common/common.dart';
|
||||||
import 'package:http/http.dart';
|
import 'package:fl_clash/state.dart';
|
||||||
import '../models/models.dart';
|
|
||||||
|
|
||||||
class Request {
|
class Request {
|
||||||
static Future<Result<Response>> getFileResponseForUrl(String url) async {
|
late final Dio _dio;
|
||||||
final headers = {'User-Agent': coreName};
|
int? _port;
|
||||||
try {
|
|
||||||
final response = await get(Uri.parse(url), headers: headers).timeout(
|
Request() {
|
||||||
httpTimeoutDuration,
|
_dio = Dio(
|
||||||
|
BaseOptions(
|
||||||
|
connectTimeout: httpTimeoutDuration,
|
||||||
|
sendTimeout: httpTimeoutDuration,
|
||||||
|
receiveTimeout: httpTimeoutDuration,
|
||||||
|
headers: {"User-Agent": coreName},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
_dio.interceptors.add(InterceptorsWrapper(
|
||||||
|
onRequest: (options, handler) {
|
||||||
|
_syncProxy();
|
||||||
|
return handler.next(options); // 继续请求
|
||||||
|
},
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
_syncProxy(){
|
||||||
|
final port = globalState.appController.clashConfig.mixedPort;
|
||||||
|
if (_port != port) {
|
||||||
|
_port = port;
|
||||||
|
_dio.httpClientAdapter = IOHttpClientAdapter(
|
||||||
|
createHttpClient: () {
|
||||||
|
final client = HttpClient();
|
||||||
|
client.findProxy = (url) {
|
||||||
|
return "PROXY localhost:$_port;DIRECT";
|
||||||
|
};
|
||||||
|
return client;
|
||||||
|
},
|
||||||
);
|
);
|
||||||
return Result.success(response);
|
|
||||||
} catch (err) {
|
|
||||||
return Result.error(err.toString());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static Future<Result<String>> checkForUpdate() async {
|
Future<Response> getFileResponseForUrl(String url) async {
|
||||||
final response = await get(
|
final response = await _dio
|
||||||
Uri.parse(
|
.get(
|
||||||
"https://api.github.com/repos/$repository/releases/latest",
|
url,
|
||||||
|
options: Options(
|
||||||
|
responseType: ResponseType.bytes,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.timeout(
|
||||||
|
httpTimeoutDuration,
|
||||||
|
);
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Map<String, dynamic>?> checkForUpdate() async {
|
||||||
|
final response = await _dio.get(
|
||||||
|
"https://api.github.com/repos/$repository/releases/latest",
|
||||||
|
options: Options(
|
||||||
|
responseType: ResponseType.json,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
if (response.statusCode != 200) return Result.error();
|
if (response.statusCode != 200) return null;
|
||||||
final body = json.decode(response.body);
|
final data = response.data as Map<String, dynamic>;
|
||||||
final remoteVersion = body['tag_name'];
|
final remoteVersion = data['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 null;
|
||||||
return Result.success(body['body']);
|
return data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final request = Request();
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ import 'dart:async';
|
|||||||
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 'models/models.dart';
|
import 'models/models.dart';
|
||||||
import 'common/common.dart';
|
import 'common/common.dart';
|
||||||
|
|
||||||
@@ -77,10 +77,10 @@ class AppController {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
addProfile(Profile profile) {
|
addProfile(Profile profile) async {
|
||||||
config.setProfile(profile);
|
config.setProfile(profile);
|
||||||
if (config.currentProfileId != null) return;
|
if (config.currentProfileId != null) return;
|
||||||
changeProfile(profile.id);
|
await changeProfile(profile.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
deleteProfile(String id) async {
|
deleteProfile(String id) async {
|
||||||
@@ -101,15 +101,12 @@ class AppController {
|
|||||||
updateProfile(String id) async {
|
updateProfile(String id) async {
|
||||||
final profile = config.getCurrentProfileForId(id);
|
final profile = config.getCurrentProfileForId(id);
|
||||||
if (profile != null) {
|
if (profile != null) {
|
||||||
final res = await profile.update();
|
await profile.update();
|
||||||
if (res.type == ResultType.success) {
|
|
||||||
config.setProfile(profile);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<String> updateClashConfig({bool isPatch = true}) async {
|
Future<void> updateClashConfig({bool isPatch = true}) async {
|
||||||
return await globalState.updateClashConfig(
|
await globalState.updateClashConfig(
|
||||||
clashConfig: clashConfig,
|
clashConfig: clashConfig,
|
||||||
config: config,
|
config: config,
|
||||||
isPatch: isPatch,
|
isPatch: isPatch,
|
||||||
@@ -117,24 +114,15 @@ class AppController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future applyProfile() async {
|
Future applyProfile() async {
|
||||||
await globalState.applyProfile(
|
final commonScaffoldState = globalState.homeScaffoldKey.currentState;
|
||||||
appState: appState,
|
if (commonScaffoldState?.mounted != true) return;
|
||||||
config: config,
|
commonScaffoldState?.loadingRun(() async {
|
||||||
clashConfig: clashConfig,
|
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 {
|
||||||
@@ -152,8 +140,10 @@ class AppController {
|
|||||||
?.add(
|
?.add(
|
||||||
profile.autoUpdateDuration,
|
profile.autoUpdateDuration,
|
||||||
)
|
)
|
||||||
.isBeforeNow();
|
.isBeforeNow;
|
||||||
if (isNotNeedUpdate == false) continue;
|
if (isNotNeedUpdate == false ||
|
||||||
|
profile.url == null ||
|
||||||
|
profile.url!.isEmpty) continue;
|
||||||
await profile.update();
|
await profile.update();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -209,14 +199,51 @@ class AppController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
autoCheckUpdate() async {
|
autoCheckUpdate() async {
|
||||||
final res = await Request.checkForUpdate();
|
if (!config.autoCheckUpdate) return;
|
||||||
if(res.type != ResultType.success) return;
|
final res = await request.checkForUpdate();
|
||||||
globalState.showMessage(
|
checkUpdateResultHandle(data: res);
|
||||||
title: appLocalizations.checkUpdate,
|
}
|
||||||
message: TextSpan(
|
|
||||||
text: res.data,
|
checkUpdateResultHandle({
|
||||||
),
|
Map<String, dynamic>? data,
|
||||||
);
|
bool handleError = false,
|
||||||
|
}) async {
|
||||||
|
if (data != null) {
|
||||||
|
final tagName = data['tag_name'];
|
||||||
|
final body = 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 {
|
afterInit() async {
|
||||||
@@ -235,7 +262,7 @@ class AppController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
healthcheck() {
|
healthcheck() {
|
||||||
if(globalState.healthcheckLock) return;
|
if (globalState.healthcheckLock) return;
|
||||||
for (final delay in appState.delayMap.entries) {
|
for (final delay in appState.delayMap.entries) {
|
||||||
setDelay(
|
setDelay(
|
||||||
Delay(
|
Delay(
|
||||||
@@ -251,11 +278,10 @@ class AppController {
|
|||||||
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}) {
|
||||||
|
if (index > appState.currentNavigationItems.length - 1) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
appState.currentLabel = appState.currentNavigationItems[index].label;
|
appState.currentLabel = appState.currentNavigationItems[index].label;
|
||||||
if ((config.isAnimateToPage || hasAnimate)) {
|
if ((config.isAnimateToPage || hasAnimate)) {
|
||||||
globalState.pageController?.animateToPage(
|
globalState.pageController?.animateToPage(
|
||||||
@@ -268,7 +294,6 @@ class AppController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
toProfiles() {
|
toProfiles() {
|
||||||
final index = appState.currentNavigationItems.indexWhere(
|
final index = appState.currentNavigationItems.indexWhere(
|
||||||
(element) => element.label == "profiles",
|
(element) => element.label == "profiles",
|
||||||
@@ -312,70 +337,50 @@ class AppController {
|
|||||||
toProfiles();
|
toProfiles();
|
||||||
final commonScaffoldState = globalState.homeScaffoldKey.currentState;
|
final commonScaffoldState = globalState.homeScaffoldKey.currentState;
|
||||||
if (commonScaffoldState?.mounted != true) return;
|
if (commonScaffoldState?.mounted != true) return;
|
||||||
commonScaffoldState?.loadingRun(
|
final profile = await commonScaffoldState?.loadingRun<Profile>(
|
||||||
() async {
|
() async {
|
||||||
await Future.delayed(const Duration(milliseconds: 300));
|
|
||||||
final profile = Profile(
|
final profile = Profile(
|
||||||
url: url,
|
url: url,
|
||||||
);
|
);
|
||||||
final res = await profile.update();
|
await profile.update();
|
||||||
if (res.type == ResultType.success) {
|
return profile;
|
||||||
addProfile(profile);
|
|
||||||
} else {
|
|
||||||
debugPrint(res.message);
|
|
||||||
globalState.showMessage(
|
|
||||||
title: "${appLocalizations.add}${appLocalizations.profile}",
|
|
||||||
message: TextSpan(text: res.message!),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
title: "${appLocalizations.add}${appLocalizations.profile}",
|
||||||
);
|
);
|
||||||
|
if (profile != null) {
|
||||||
|
await addProfile(profile);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
addProfileFormFile() async {
|
addProfileFormFile() async {
|
||||||
final result = await picker.pickerConfigFile();
|
final platformFile = await globalState.safeRun(picker.pickerConfigFile);
|
||||||
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);
|
||||||
toProfiles();
|
toProfiles();
|
||||||
final commonScaffoldState = globalState.homeScaffoldKey.currentState;
|
final commonScaffoldState = globalState.homeScaffoldKey.currentState;
|
||||||
if (commonScaffoldState?.mounted != true) return;
|
if (commonScaffoldState?.mounted != true) return;
|
||||||
commonScaffoldState?.loadingRun(
|
final profile = await commonScaffoldState?.loadingRun<Profile?>(
|
||||||
() async {
|
() async {
|
||||||
await Future.delayed(const Duration(milliseconds: 300));
|
await Future.delayed(const Duration(milliseconds: 300));
|
||||||
final bytes = result.data?.bytes;
|
final bytes = platformFile?.bytes;
|
||||||
if (bytes == null) {
|
if (bytes == null) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
final profile = Profile(label: result.data?.name);
|
final profile = Profile(label: platformFile?.name);
|
||||||
final sRes = await profile.saveFile(bytes);
|
await profile.saveFile(bytes);
|
||||||
if (sRes.type == ResultType.error) {
|
return profile;
|
||||||
debugPrint(sRes.message);
|
|
||||||
globalState.showMessage(
|
|
||||||
title: "${appLocalizations.add}${appLocalizations.profile}",
|
|
||||||
message: TextSpan(text: sRes.message!),
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
addProfile(profile);
|
|
||||||
},
|
},
|
||||||
|
title: "${appLocalizations.add}${appLocalizations.profile}",
|
||||||
);
|
);
|
||||||
|
if (profile != null) {
|
||||||
|
await addProfile(profile);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
addProfileFormQrCode() async {
|
addProfileFormQrCode() async {
|
||||||
final result = await picker.pickerConfigQRCode();
|
final url = await globalState.safeRun(picker.pickerConfigQRCode);
|
||||||
if (result.type == ResultType.error) {
|
if (url == null) return;
|
||||||
if(result.message != null){
|
addProfileFormURL(url);
|
||||||
globalState.showMessage(
|
|
||||||
title: appLocalizations.tip,
|
|
||||||
message: TextSpan(
|
|
||||||
text: result.message,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
addProfileFormURL(result.data!);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
clearShowProxyDelay() {
|
clearShowProxyDelay() {
|
||||||
@@ -394,12 +399,9 @@ class AppController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
updateViewWidth(){
|
updateViewWidth(double width) {
|
||||||
appState.viewWidth = context.width;
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
if(appState.viewWidth == 0){
|
appState.viewWidth = width;
|
||||||
Future.delayed(moreDuration,(){
|
});
|
||||||
updateViewWidth();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
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/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';
|
||||||
@@ -12,26 +10,15 @@ class AboutFragment extends StatelessWidget {
|
|||||||
_checkUpdate(BuildContext context) async {
|
_checkUpdate(BuildContext context) async {
|
||||||
final commonScaffoldState = context.commonScaffoldState;
|
final commonScaffoldState = context.commonScaffoldState;
|
||||||
if (commonScaffoldState?.mounted != true) return;
|
if (commonScaffoldState?.mounted != true) return;
|
||||||
final res = await commonScaffoldState?.loadingRun<Result<String>>(
|
final data =
|
||||||
Request.checkForUpdate,
|
await commonScaffoldState?.loadingRun<Map<String, dynamic>?>(
|
||||||
|
request.checkForUpdate,
|
||||||
title: appLocalizations.checkUpdate,
|
title: appLocalizations.checkUpdate,
|
||||||
);
|
);
|
||||||
if (res == null) return;
|
globalState.appController.checkUpdateResultHandle(
|
||||||
if (res.type == ResultType.success) {
|
data: data,
|
||||||
globalState.showMessage(
|
handleError: true,
|
||||||
title: appLocalizations.checkUpdate,
|
);
|
||||||
message: TextSpan(
|
|
||||||
text: res.data,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
globalState.showMessage(
|
|
||||||
title: appLocalizations.checkUpdate,
|
|
||||||
message: TextSpan(
|
|
||||||
text: appLocalizations.checkUpdateError,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -92,7 +79,7 @@ class AboutFragment extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
ListTile(
|
ListTile(
|
||||||
title: Text(appLocalizations.checkUpdate),
|
title: Text(appLocalizations.checkUpdate),
|
||||||
onTap: (){
|
onTap: () {
|
||||||
_checkUpdate(context);
|
_checkUpdate(context);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
|
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';
|
||||||
@@ -19,8 +21,10 @@ class _AccessFragmentState extends State<AccessFragment> {
|
|||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) async {
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
packagesListenable.value = await app?.getPackages() ?? [];
|
Future.delayed(const Duration(milliseconds: 300), () async {
|
||||||
|
packagesListenable.value = await app?.getPackages() ?? [];
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -91,13 +95,28 @@ class _AccessFragmentState extends State<AccessFragment> {
|
|||||||
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
|
||||||
@@ -181,7 +200,8 @@ class _AccessFragmentState extends State<AccessFragment> {
|
|||||||
children: [
|
children: [
|
||||||
Flexible(
|
Flexible(
|
||||||
child: _buildSelectedAllButton(
|
child: _buildSelectedAllButton(
|
||||||
isSelectedAll: valueList.length == packageNameList.length,
|
isSelectedAll: const ListEquality<String>()
|
||||||
|
.equals(valueList, packageNameList),
|
||||||
allValueList: packageNameList,
|
allValueList: packageNameList,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -195,29 +215,59 @@ class _AccessFragmentState extends State<AccessFragment> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildPackageList(bool isAccessControl) {
|
Widget _buildPackageList() {
|
||||||
return ValueListenableBuilder(
|
return ValueListenableBuilder(
|
||||||
valueListenable: packagesListenable,
|
valueListenable: packagesListenable,
|
||||||
builder: (_, packages, ___) {
|
builder: (_, packages, ___) {
|
||||||
return Selector<Config, AccessControl>(
|
final accessControl = globalState.appController.config.accessControl;
|
||||||
selector: (_, config) => config.accessControl,
|
final acceptList = accessControl.acceptList;
|
||||||
builder: (context, accessControl, __) {
|
final rejectList = accessControl.rejectList;
|
||||||
|
final acceptPackages = packages.sorted((a, b) {
|
||||||
|
final isSelectA = acceptList.contains(a.packageName);
|
||||||
|
final isSelectB = acceptList.contains(b.packageName);
|
||||||
|
if (isSelectA && isSelectB) return 0;
|
||||||
|
if (isSelectA) return -1;
|
||||||
|
if (isSelectB) return 1;
|
||||||
|
return 0;
|
||||||
|
});
|
||||||
|
final rejectPackages = packages.sorted((a, b) {
|
||||||
|
final isSelectA = rejectList.contains(a.packageName);
|
||||||
|
final isSelectB = rejectList.contains(b.packageName);
|
||||||
|
if (isSelectA && isSelectB) return 0;
|
||||||
|
if (isSelectA) return -1;
|
||||||
|
if (isSelectB) return 1;
|
||||||
|
return 0;
|
||||||
|
});
|
||||||
|
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 isFilterSystemApp = accessControl.isFilterSystemApp;
|
||||||
|
final accessControlMode = accessControl.mode;
|
||||||
|
final packages =
|
||||||
|
accessControlMode == AccessControlMode.acceptSelected
|
||||||
|
? acceptPackages
|
||||||
|
: rejectPackages;
|
||||||
|
final currentList =
|
||||||
|
accessControlMode == AccessControlMode.acceptSelected
|
||||||
|
? accessControl.acceptList
|
||||||
|
: accessControl.rejectList;
|
||||||
final currentPackages = isFilterSystemApp
|
final currentPackages = isFilterSystemApp
|
||||||
? packages
|
? packages
|
||||||
.where((element) => element.isSystem == false)
|
.where((element) => element.isSystem == false)
|
||||||
.toList()
|
.toList()
|
||||||
: packages;
|
: packages;
|
||||||
final packageNameList =
|
final packageNameList =
|
||||||
currentPackages.map((e) => e.packageName).toList();
|
currentPackages.map((e) => e.packageName).toList();
|
||||||
final accessControlMode = accessControl.mode;
|
final valueList = currentList.intersection(packageNameList);
|
||||||
final valueList =
|
|
||||||
accessControl.currentList.intersection(packageNameList);
|
|
||||||
final describe =
|
final describe =
|
||||||
accessControlMode == AccessControlMode.acceptSelected
|
accessControlMode == AccessControlMode.acceptSelected
|
||||||
? appLocalizations.accessControlAllowDesc
|
? appLocalizations.accessControlAllowDesc
|
||||||
: appLocalizations.accessControlNotAllowDesc;
|
: appLocalizations.accessControlNotAllowDesc;
|
||||||
|
|
||||||
return DisabledMask(
|
return DisabledMask(
|
||||||
status: !isAccessControl,
|
status: !isAccessControl,
|
||||||
child: Column(
|
child: Column(
|
||||||
@@ -241,7 +291,7 @@ class _AccessFragmentState extends State<AccessFragment> {
|
|||||||
itemBuilder: (_, index) {
|
itemBuilder: (_, index) {
|
||||||
final package = currentPackages[index];
|
final package = currentPackages[index];
|
||||||
return PackageListItem(
|
return PackageListItem(
|
||||||
key: Key(package.label),
|
key: Key(package.packageName),
|
||||||
package: package,
|
package: package,
|
||||||
value:
|
value:
|
||||||
valueList.contains(package.packageName),
|
valueList.contains(package.packageName),
|
||||||
@@ -252,11 +302,20 @@ class _AccessFragmentState extends State<AccessFragment> {
|
|||||||
} else {
|
} else {
|
||||||
valueList.remove(package.packageName);
|
valueList.remove(package.packageName);
|
||||||
}
|
}
|
||||||
final config = context.read<Config>();
|
final config =
|
||||||
config.accessControl.currentList =
|
globalState.appController.config;
|
||||||
valueList;
|
if (accessControlMode ==
|
||||||
config.accessControl =
|
AccessControlMode.acceptSelected) {
|
||||||
config.accessControl.copyWith();
|
config.accessControl =
|
||||||
|
config.accessControl.copyWith(
|
||||||
|
acceptList: valueList,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
config.accessControl =
|
||||||
|
config.accessControl.copyWith(
|
||||||
|
rejectList: valueList,
|
||||||
|
);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -276,7 +335,7 @@ class _AccessFragmentState extends State<AccessFragment> {
|
|||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
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: [
|
||||||
@@ -300,11 +359,12 @@ class _AccessFragmentState extends State<AccessFragment> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
Flexible(
|
Flexible(
|
||||||
child: _buildPackageList(isAccessControl),
|
child: child!,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
child: _buildPackageList(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,4 +8,5 @@ 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';
|
export 'backup_and_recovery.dart';
|
||||||
|
export 'resources.dart';
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import 'package:collection/collection.dart';
|
import 'dart:async';
|
||||||
|
|
||||||
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/state.dart';
|
import 'package:fl_clash/state.dart';
|
||||||
@@ -7,10 +8,40 @@ import 'package:provider/provider.dart';
|
|||||||
import '../models/models.dart';
|
import '../models/models.dart';
|
||||||
import '../widgets/widgets.dart';
|
import '../widgets/widgets.dart';
|
||||||
|
|
||||||
class LogsFragment extends StatelessWidget {
|
class LogsFragment extends StatefulWidget {
|
||||||
const LogsFragment({super.key});
|
const LogsFragment({super.key});
|
||||||
|
|
||||||
_initActions(BuildContext context) {
|
@override
|
||||||
|
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(milliseconds: 200), (timer) {
|
||||||
|
logsNotifier.value = globalState.appController.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>();
|
||||||
@@ -20,7 +51,7 @@ class LogsFragment extends StatelessWidget {
|
|||||||
showSearch(
|
showSearch(
|
||||||
context: context,
|
context: context,
|
||||||
delegate: LogsSearchDelegate(
|
delegate: LogsSearchDelegate(
|
||||||
logs: globalState.appController.appState.logs.reversed.toList(),
|
logs: logsNotifier.value.reversed.toList(),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -31,10 +62,8 @@ class LogsFragment extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_buildList() {
|
_buildList() {
|
||||||
return Selector<AppState, List<Log>>(
|
return ValueListenableBuilder<List<Log>>(
|
||||||
selector: (_, appState) => appState.logs,
|
valueListenable: logsNotifier,
|
||||||
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(
|
||||||
@@ -48,7 +77,6 @@ class LogsFragment extends StatelessWidget {
|
|||||||
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,
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -65,14 +93,13 @@ class LogsFragment extends StatelessWidget {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Selector<AppState, bool?>(
|
return Selector<AppState, bool?>(
|
||||||
selector: (_, appState) {
|
selector: (_, appState) =>
|
||||||
return appState.currentLabel == 'logs' ||
|
appState.currentLabel == 'logs' ||
|
||||||
appState.viewMode == ViewMode.mobile &&
|
appState.viewMode == ViewMode.mobile &&
|
||||||
appState.currentLabel == "tools";
|
appState.currentLabel == "tools",
|
||||||
},
|
|
||||||
builder: (_, isCurrent, child) {
|
builder: (_, isCurrent, child) {
|
||||||
if (isCurrent == null || isCurrent) {
|
if (isCurrent == null || isCurrent) {
|
||||||
_initActions(context);
|
_initActions();
|
||||||
}
|
}
|
||||||
return child!;
|
return child!;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ class ProfilesFragment extends StatefulWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _ProfilesFragmentState extends State<ProfilesFragment> {
|
class _ProfilesFragmentState extends State<ProfilesFragment> {
|
||||||
|
|
||||||
_handleDeleteProfile(String id) async {
|
_handleDeleteProfile(String id) async {
|
||||||
globalState.appController.deleteProfile(id);
|
globalState.appController.deleteProfile(id);
|
||||||
}
|
}
|
||||||
@@ -176,30 +175,6 @@ class ProfileItem extends StatelessWidget {
|
|||||||
required this.onChanged,
|
required this.onChanged,
|
||||||
});
|
});
|
||||||
|
|
||||||
String _getLastUpdateTimeDifference(DateTime lastDateTime) {
|
|
||||||
final currentDateTime = DateTime.now();
|
|
||||||
final difference = currentDateTime.difference(lastDateTime);
|
|
||||||
final days = difference.inDays;
|
|
||||||
if (days >= 365) {
|
|
||||||
return "${(days / 365).floor()} ${appLocalizations.years}${appLocalizations.ago}";
|
|
||||||
}
|
|
||||||
if (days >= 30) {
|
|
||||||
return "${(days / 30).floor()} ${appLocalizations.months}${appLocalizations.ago}";
|
|
||||||
}
|
|
||||||
if (days >= 1) {
|
|
||||||
return "$days ${appLocalizations.days}${appLocalizations.ago}";
|
|
||||||
}
|
|
||||||
final hours = difference.inHours;
|
|
||||||
if (hours >= 1) {
|
|
||||||
return "$hours ${appLocalizations.hours}${appLocalizations.ago}";
|
|
||||||
}
|
|
||||||
final minutes = difference.inMinutes;
|
|
||||||
if (minutes >= 1) {
|
|
||||||
return "$minutes ${appLocalizations.minutes}${appLocalizations.ago}";
|
|
||||||
}
|
|
||||||
return appLocalizations.just;
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
String useShow;
|
String useShow;
|
||||||
@@ -246,9 +221,7 @@ class ProfileItem extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
Flexible(
|
Flexible(
|
||||||
child: Text(
|
child: Text(
|
||||||
profile.lastUpdateDate != null
|
profile.lastUpdateDate?.lastUpdateTimeDesc ?? '',
|
||||||
? _getLastUpdateTimeDifference(profile.lastUpdateDate!)
|
|
||||||
: '',
|
|
||||||
style: Theme.of(context).textTheme.labelMedium?.toLight(),
|
style: Theme.of(context).textTheme.labelMedium?.toLight(),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -399,7 +399,6 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
|
|||||||
with SingleTickerProviderStateMixin {
|
with SingleTickerProviderStateMixin {
|
||||||
late AnimationController _controller;
|
late AnimationController _controller;
|
||||||
late Animation<double> _scale;
|
late Animation<double> _scale;
|
||||||
late Animation<double> _opacity;
|
|
||||||
|
|
||||||
_healthcheck() async {
|
_healthcheck() async {
|
||||||
if (globalState.healthcheckLock) return;
|
if (globalState.healthcheckLock) return;
|
||||||
@@ -416,7 +415,7 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
|
|||||||
_controller = AnimationController(
|
_controller = AnimationController(
|
||||||
vsync: this,
|
vsync: this,
|
||||||
duration: const Duration(
|
duration: const Duration(
|
||||||
milliseconds: 300,
|
milliseconds: 600,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
_scale = Tween<double>(
|
_scale = Tween<double>(
|
||||||
@@ -432,19 +431,6 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
_opacity = Tween<double>(
|
|
||||||
begin: 1.0,
|
|
||||||
end: 0.0,
|
|
||||||
).animate(
|
|
||||||
CurvedAnimation(
|
|
||||||
parent: _controller,
|
|
||||||
curve: const Interval(
|
|
||||||
0,
|
|
||||||
1,
|
|
||||||
curve: Curves.easeIn,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -465,10 +451,7 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
|
|||||||
height: 56,
|
height: 56,
|
||||||
child: Transform.scale(
|
child: Transform.scale(
|
||||||
scale: _scale.value,
|
scale: _scale.value,
|
||||||
child: Opacity(
|
child: child,
|
||||||
opacity: _opacity.value,
|
|
||||||
child: child!,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|||||||
172
lib/fragments/resources.dart
Normal file
172
lib/fragments/resources.dart
Normal file
@@ -0,0 +1,172 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:fl_clash/clash/clash.dart';
|
||||||
|
import 'package:fl_clash/common/common.dart';
|
||||||
|
import 'package:fl_clash/models/ffi.dart';
|
||||||
|
import 'package:fl_clash/widgets/widgets.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:path/path.dart' hide context;
|
||||||
|
|
||||||
|
@immutable
|
||||||
|
class GeoItem {
|
||||||
|
final String label;
|
||||||
|
final String fileName;
|
||||||
|
|
||||||
|
const GeoItem({
|
||||||
|
required this.label,
|
||||||
|
required this.fileName,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
class Resources extends StatefulWidget {
|
||||||
|
const Resources({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<Resources> createState() => _ResourcesState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ResourcesState extends State<Resources> {
|
||||||
|
_updateExternalProvider(
|
||||||
|
String providerName,
|
||||||
|
String providerType,
|
||||||
|
) async {
|
||||||
|
final commonScaffoldState = context.commonScaffoldState;
|
||||||
|
await commonScaffoldState?.loadingRun(() async {
|
||||||
|
final message = await clashCore.updateExternalProvider(
|
||||||
|
providerName: providerName,
|
||||||
|
providerType: providerType,
|
||||||
|
);
|
||||||
|
if (message.isNotEmpty) throw message;
|
||||||
|
});
|
||||||
|
setState(() {});
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<DateTime> _getGeoFileLastModified(String fileName) async {
|
||||||
|
final homePath = await appPath.getHomeDirPath();
|
||||||
|
return await File(join(homePath, fileName)).lastModified();
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildExternalProviderSection() {
|
||||||
|
return FutureBuilder<List<ExternalProvider>>(
|
||||||
|
future: () async {
|
||||||
|
await Future.delayed(const Duration(milliseconds: 200));
|
||||||
|
return await clashCore.getExternalProviders();
|
||||||
|
}(),
|
||||||
|
builder: (_, snapshot) {
|
||||||
|
return Center(
|
||||||
|
child: FadeBox(
|
||||||
|
key: const Key("external_providers"),
|
||||||
|
child: snapshot.data == null || snapshot.data!.isEmpty
|
||||||
|
? Container()
|
||||||
|
: Section(
|
||||||
|
title: appLocalizations.externalResources,
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
for (final externalProvider in snapshot.data!)
|
||||||
|
ListItem(
|
||||||
|
title: Text(externalProvider.name),
|
||||||
|
subtitle: Text(
|
||||||
|
"${externalProvider.type} (${externalProvider.vehicleType})",
|
||||||
|
),
|
||||||
|
trailing: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
externalProvider.updateAt.lastUpdateTimeDesc,
|
||||||
|
style: context.textTheme.bodyMedium,
|
||||||
|
),
|
||||||
|
const Padding(
|
||||||
|
padding: EdgeInsets.only(left: 12,right: 4),
|
||||||
|
child: VerticalDivider(
|
||||||
|
endIndent: 2,
|
||||||
|
width: 4,
|
||||||
|
indent: 2,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
externalProvider.vehicleType == "HTTP"
|
||||||
|
? IconButton(
|
||||||
|
icon: const Icon(Icons.sync),
|
||||||
|
onPressed: () {
|
||||||
|
_updateExternalProvider(
|
||||||
|
externalProvider.name,
|
||||||
|
externalProvider.type,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
)
|
||||||
|
: Container(),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildGeoDataSection() {
|
||||||
|
const geoItems = <GeoItem>[
|
||||||
|
GeoItem(label: "GeoIp", fileName: mmdbFileName),
|
||||||
|
GeoItem(label: "GeoSite", fileName: geoSiteFileName),
|
||||||
|
GeoItem(label: "ASN", fileName: asnFileName),
|
||||||
|
];
|
||||||
|
return Section(
|
||||||
|
title: appLocalizations.geoData,
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
for (final geoItem in geoItems)
|
||||||
|
ListItem(
|
||||||
|
title: Text(geoItem.label),
|
||||||
|
subtitle: FutureBuilder<DateTime>(
|
||||||
|
future: () async {
|
||||||
|
await Future.delayed(const Duration(milliseconds: 200));
|
||||||
|
return await _getGeoFileLastModified(geoItem.fileName);
|
||||||
|
}(),
|
||||||
|
builder: (_, snapshot) {
|
||||||
|
return Container(
|
||||||
|
alignment: Alignment.centerLeft,
|
||||||
|
height: 24,
|
||||||
|
child: FadeBox(
|
||||||
|
key: Key("fade_box_${geoItem.label}"),
|
||||||
|
child: snapshot.data == null
|
||||||
|
? const SizedBox(
|
||||||
|
width: 24,
|
||||||
|
height: 24,
|
||||||
|
child: CircularProgressIndicator(
|
||||||
|
strokeWidth: 2,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: Text(
|
||||||
|
snapshot.data!.lastUpdateTimeDesc,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
trailing: IconButton(
|
||||||
|
icon: const Icon(Icons.sync),
|
||||||
|
onPressed: () {
|
||||||
|
_updateExternalProvider(
|
||||||
|
geoItem.fileName,
|
||||||
|
geoItem.label,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return ListView(
|
||||||
|
children: [
|
||||||
|
_buildGeoDataSection(),
|
||||||
|
_buildExternalProviderSection(),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,6 +9,8 @@
|
|||||||
"tools": "Tools",
|
"tools": "Tools",
|
||||||
"logs": "Logs",
|
"logs": "Logs",
|
||||||
"logsDesc": "Log capture records",
|
"logsDesc": "Log capture records",
|
||||||
|
"resources": "Resources",
|
||||||
|
"resourcesDesc": "External resource related info",
|
||||||
"trafficUsage": "Traffic usage",
|
"trafficUsage": "Traffic usage",
|
||||||
"coreInfo": "Core info",
|
"coreInfo": "Core info",
|
||||||
"nullCoreInfoDesc": "Unable to obtain core info",
|
"nullCoreInfoDesc": "Unable to obtain core info",
|
||||||
@@ -149,5 +151,10 @@
|
|||||||
"passwordTip": "Password cannot be empty",
|
"passwordTip": "Password cannot be empty",
|
||||||
"accountTip": "Account cannot be empty",
|
"accountTip": "Account cannot be empty",
|
||||||
"checkUpdate": "Check for updates",
|
"checkUpdate": "Check for updates",
|
||||||
"checkUpdateError": "The current application is already the latest version"
|
"discoverNewVersion": "Discover the new version",
|
||||||
|
"checkUpdateError": "The current application is already the latest version",
|
||||||
|
"goDownload": "Go to download",
|
||||||
|
"unknown": "Unknown",
|
||||||
|
"geoData": "GeoData",
|
||||||
|
"externalResources": "External resources"
|
||||||
}
|
}
|
||||||
@@ -9,6 +9,8 @@
|
|||||||
"tools": "工具",
|
"tools": "工具",
|
||||||
"logs": "日志",
|
"logs": "日志",
|
||||||
"logsDesc": "日志捕获记录",
|
"logsDesc": "日志捕获记录",
|
||||||
|
"resources": "资源",
|
||||||
|
"resourcesDesc": "外部资源相关信息",
|
||||||
"trafficUsage": "流量统计",
|
"trafficUsage": "流量统计",
|
||||||
"coreInfo": "内核信息",
|
"coreInfo": "内核信息",
|
||||||
"nullCoreInfoDesc": "无法获取内核信息",
|
"nullCoreInfoDesc": "无法获取内核信息",
|
||||||
@@ -149,5 +151,10 @@
|
|||||||
"passwordTip": "密码不能为空",
|
"passwordTip": "密码不能为空",
|
||||||
"accountTip": "账号不能为空",
|
"accountTip": "账号不能为空",
|
||||||
"checkUpdate": "检查更新",
|
"checkUpdate": "检查更新",
|
||||||
"checkUpdateError": "当前应用已经是最新版了"
|
"discoverNewVersion": "发现新版本",
|
||||||
|
"checkUpdateError": "当前应用已经是最新版了",
|
||||||
|
"goDownload": "前往下载",
|
||||||
|
"unknown": "未知",
|
||||||
|
"geoData": "地理数据",
|
||||||
|
"externalResources": "外部资源"
|
||||||
}
|
}
|
||||||
@@ -99,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":
|
||||||
@@ -107,12 +109,16 @@ class MessageLookup extends MessageLookupByLibrary {
|
|||||||
"edit": MessageLookupByLibrary.simpleMessage("Edit"),
|
"edit": MessageLookupByLibrary.simpleMessage("Edit"),
|
||||||
"en": MessageLookupByLibrary.simpleMessage("English"),
|
"en": MessageLookupByLibrary.simpleMessage("English"),
|
||||||
"exit": MessageLookupByLibrary.simpleMessage("Exit"),
|
"exit": MessageLookupByLibrary.simpleMessage("Exit"),
|
||||||
|
"externalResources":
|
||||||
|
MessageLookupByLibrary.simpleMessage("External resources"),
|
||||||
"file": MessageLookupByLibrary.simpleMessage("File"),
|
"file": MessageLookupByLibrary.simpleMessage("File"),
|
||||||
"fileDesc":
|
"fileDesc":
|
||||||
MessageLookupByLibrary.simpleMessage("Directly upload profile"),
|
MessageLookupByLibrary.simpleMessage("Directly upload profile"),
|
||||||
"filterSystemApp":
|
"filterSystemApp":
|
||||||
MessageLookupByLibrary.simpleMessage("Filter system app"),
|
MessageLookupByLibrary.simpleMessage("Filter system app"),
|
||||||
|
"geoData": MessageLookupByLibrary.simpleMessage("GeoData"),
|
||||||
"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"),
|
||||||
@@ -196,6 +202,9 @@ class MessageLookup extends MessageLookupByLibrary {
|
|||||||
MessageLookupByLibrary.simpleMessage("Only recovery profiles"),
|
MessageLookupByLibrary.simpleMessage("Only recovery profiles"),
|
||||||
"recoverySuccess":
|
"recoverySuccess":
|
||||||
MessageLookupByLibrary.simpleMessage("Recovery success"),
|
MessageLookupByLibrary.simpleMessage("Recovery success"),
|
||||||
|
"resources": MessageLookupByLibrary.simpleMessage("Resources"),
|
||||||
|
"resourcesDesc": MessageLookupByLibrary.simpleMessage(
|
||||||
|
"External resource related info"),
|
||||||
"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"),
|
||||||
@@ -226,6 +235,7 @@ class MessageLookup extends MessageLookupByLibrary {
|
|||||||
"unableToUpdateCurrentProfileDesc":
|
"unableToUpdateCurrentProfileDesc":
|
||||||
MessageLookupByLibrary.simpleMessage(
|
MessageLookupByLibrary.simpleMessage(
|
||||||
"unable to update current profile"),
|
"unable to update current profile"),
|
||||||
|
"unknown": MessageLookupByLibrary.simpleMessage("Unknown"),
|
||||||
"update": MessageLookupByLibrary.simpleMessage("Update"),
|
"update": MessageLookupByLibrary.simpleMessage("Update"),
|
||||||
"upload": MessageLookupByLibrary.simpleMessage("Upload"),
|
"upload": MessageLookupByLibrary.simpleMessage("Upload"),
|
||||||
"url": MessageLookupByLibrary.simpleMessage("URL"),
|
"url": MessageLookupByLibrary.simpleMessage("URL"),
|
||||||
|
|||||||
@@ -83,16 +83,20 @@ 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("下载"),
|
||||||
"edit": MessageLookupByLibrary.simpleMessage("编辑"),
|
"edit": MessageLookupByLibrary.simpleMessage("编辑"),
|
||||||
"en": MessageLookupByLibrary.simpleMessage("英语"),
|
"en": MessageLookupByLibrary.simpleMessage("英语"),
|
||||||
"exit": MessageLookupByLibrary.simpleMessage("退出"),
|
"exit": MessageLookupByLibrary.simpleMessage("退出"),
|
||||||
|
"externalResources": MessageLookupByLibrary.simpleMessage("外部资源"),
|
||||||
"file": MessageLookupByLibrary.simpleMessage("文件"),
|
"file": MessageLookupByLibrary.simpleMessage("文件"),
|
||||||
"fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
|
"fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
|
||||||
"filterSystemApp": MessageLookupByLibrary.simpleMessage("过滤系统应用"),
|
"filterSystemApp": MessageLookupByLibrary.simpleMessage("过滤系统应用"),
|
||||||
|
"geoData": 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("刚刚"),
|
||||||
@@ -159,6 +163,8 @@ class MessageLookup extends MessageLookupByLibrary {
|
|||||||
"recoveryDesc": MessageLookupByLibrary.simpleMessage("从WebDAV恢复数据"),
|
"recoveryDesc": MessageLookupByLibrary.simpleMessage("从WebDAV恢复数据"),
|
||||||
"recoveryProfiles": MessageLookupByLibrary.simpleMessage("仅恢复配置文件"),
|
"recoveryProfiles": MessageLookupByLibrary.simpleMessage("仅恢复配置文件"),
|
||||||
"recoverySuccess": MessageLookupByLibrary.simpleMessage("恢复成功"),
|
"recoverySuccess": MessageLookupByLibrary.simpleMessage("恢复成功"),
|
||||||
|
"resources": MessageLookupByLibrary.simpleMessage("资源"),
|
||||||
|
"resourcesDesc": MessageLookupByLibrary.simpleMessage("外部资源相关信息"),
|
||||||
"rule": MessageLookupByLibrary.simpleMessage("规则"),
|
"rule": MessageLookupByLibrary.simpleMessage("规则"),
|
||||||
"save": MessageLookupByLibrary.simpleMessage("保存"),
|
"save": MessageLookupByLibrary.simpleMessage("保存"),
|
||||||
"selectAll": MessageLookupByLibrary.simpleMessage("全选"),
|
"selectAll": MessageLookupByLibrary.simpleMessage("全选"),
|
||||||
@@ -185,6 +191,7 @@ class MessageLookup extends MessageLookupByLibrary {
|
|||||||
"tunDesc": MessageLookupByLibrary.simpleMessage("仅在管理员模式生效"),
|
"tunDesc": MessageLookupByLibrary.simpleMessage("仅在管理员模式生效"),
|
||||||
"unableToUpdateCurrentProfileDesc":
|
"unableToUpdateCurrentProfileDesc":
|
||||||
MessageLookupByLibrary.simpleMessage("无法更新当前配置文件"),
|
MessageLookupByLibrary.simpleMessage("无法更新当前配置文件"),
|
||||||
|
"unknown": MessageLookupByLibrary.simpleMessage("未知"),
|
||||||
"update": MessageLookupByLibrary.simpleMessage("更新"),
|
"update": MessageLookupByLibrary.simpleMessage("更新"),
|
||||||
"upload": MessageLookupByLibrary.simpleMessage("上传"),
|
"upload": MessageLookupByLibrary.simpleMessage("上传"),
|
||||||
"url": MessageLookupByLibrary.simpleMessage("URL"),
|
"url": MessageLookupByLibrary.simpleMessage("URL"),
|
||||||
|
|||||||
@@ -150,6 +150,26 @@ class AppLocalizations {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// `Resources`
|
||||||
|
String get resources {
|
||||||
|
return Intl.message(
|
||||||
|
'Resources',
|
||||||
|
name: 'resources',
|
||||||
|
desc: '',
|
||||||
|
args: [],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `External resource related info`
|
||||||
|
String get resourcesDesc {
|
||||||
|
return Intl.message(
|
||||||
|
'External resource related info',
|
||||||
|
name: 'resourcesDesc',
|
||||||
|
desc: '',
|
||||||
|
args: [],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/// `Traffic usage`
|
/// `Traffic usage`
|
||||||
String get trafficUsage {
|
String get trafficUsage {
|
||||||
return Intl.message(
|
return Intl.message(
|
||||||
@@ -1550,6 +1570,16 @@ class AppLocalizations {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// `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`
|
/// `The current application is already the latest version`
|
||||||
String get checkUpdateError {
|
String get checkUpdateError {
|
||||||
return Intl.message(
|
return Intl.message(
|
||||||
@@ -1559,6 +1589,46 @@ class AppLocalizations {
|
|||||||
args: [],
|
args: [],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// `Go to download`
|
||||||
|
String get goDownload {
|
||||||
|
return Intl.message(
|
||||||
|
'Go to download',
|
||||||
|
name: 'goDownload',
|
||||||
|
desc: '',
|
||||||
|
args: [],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `Unknown`
|
||||||
|
String get unknown {
|
||||||
|
return Intl.message(
|
||||||
|
'Unknown',
|
||||||
|
name: 'unknown',
|
||||||
|
desc: '',
|
||||||
|
args: [],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `GeoData`
|
||||||
|
String get geoData {
|
||||||
|
return Intl.message(
|
||||||
|
'GeoData',
|
||||||
|
name: 'geoData',
|
||||||
|
desc: '',
|
||||||
|
args: [],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `External resources`
|
||||||
|
String get externalResources {
|
||||||
|
return Intl.message(
|
||||||
|
'External resources',
|
||||||
|
name: 'externalResources',
|
||||||
|
desc: '',
|
||||||
|
args: [],
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {
|
class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ Future<void> main() async {
|
|||||||
mode: clashConfig.mode,
|
mode: clashConfig.mode,
|
||||||
isCompatible: config.isCompatible,
|
isCompatible: config.isCompatible,
|
||||||
selectedMap: config.currentSelectedMap,
|
selectedMap: config.currentSelectedMap,
|
||||||
viewWidth: other.getViewWidth(),
|
|
||||||
);
|
);
|
||||||
await globalState.init(
|
await globalState.init(
|
||||||
appState: appState,
|
appState: appState,
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ class AppState with ChangeNotifier {
|
|||||||
|
|
||||||
AppState({
|
AppState({
|
||||||
required Mode mode,
|
required Mode mode,
|
||||||
double? viewWidth,
|
|
||||||
required bool isCompatible,
|
required bool isCompatible,
|
||||||
required SelectedMap selectedMap,
|
required SelectedMap selectedMap,
|
||||||
}) : _navigationItems = [],
|
}) : _navigationItems = [],
|
||||||
@@ -40,7 +39,7 @@ class AppState with ChangeNotifier {
|
|||||||
_currentLabel = "dashboard",
|
_currentLabel = "dashboard",
|
||||||
_traffics = [],
|
_traffics = [],
|
||||||
_logs = [],
|
_logs = [],
|
||||||
_viewWidth = viewWidth ?? 0,
|
_viewWidth = 0,
|
||||||
_selectedMap = selectedMap,
|
_selectedMap = selectedMap,
|
||||||
_sortNum = 0,
|
_sortNum = 0,
|
||||||
_mode = mode,
|
_mode = mode,
|
||||||
@@ -167,6 +166,9 @@ class AppState with ChangeNotifier {
|
|||||||
|
|
||||||
addLog(Log log) {
|
addLog(Log log) {
|
||||||
_logs.add(log);
|
_logs.add(log);
|
||||||
|
if(_logs.length > 60){
|
||||||
|
_logs = _logs.sublist(_logs.length - 60);
|
||||||
|
}
|
||||||
notifyListeners();
|
notifyListeners();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -179,7 +181,6 @@ class AppState with ChangeNotifier {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
List<Group> get groups => _groups;
|
List<Group> get groups => _groups;
|
||||||
|
|
||||||
set groups(List<Group> value) {
|
set groups(List<Group> value) {
|
||||||
@@ -253,11 +254,7 @@ class AppState with ChangeNotifier {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ViewMode get viewMode {
|
ViewMode get viewMode => other.getViewMode(_viewWidth);
|
||||||
if (_viewWidth <= maxMobileWidth) return ViewMode.mobile;
|
|
||||||
if (_viewWidth <= maxLaptopWidth) return ViewMode.laptop;
|
|
||||||
return ViewMode.desktop;
|
|
||||||
}
|
|
||||||
|
|
||||||
DelayMap get delayMap {
|
DelayMap get delayMap {
|
||||||
return _delayMap;
|
return _delayMap;
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
import 'package:fl_clash/enum/enum.dart';
|
|
||||||
|
|
||||||
class Result<T> {
|
|
||||||
String? message;
|
|
||||||
ResultType type;
|
|
||||||
T? data;
|
|
||||||
|
|
||||||
Result({
|
|
||||||
this.message,
|
|
||||||
required this.type,
|
|
||||||
this.data,
|
|
||||||
});
|
|
||||||
|
|
||||||
Result.success([this.data]) : type = ResultType.success,
|
|
||||||
message = null;
|
|
||||||
|
|
||||||
Result.error([this.message]) : type = ResultType.error,
|
|
||||||
data = null;
|
|
||||||
|
|
||||||
@override
|
|
||||||
String toString() {
|
|
||||||
return 'Result{message: $message, type: $type, data: $data}';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,78 +1,26 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
bool operator ==(Object other) =>
|
|
||||||
identical(this, other) ||
|
|
||||||
other is AccessControl &&
|
|
||||||
runtimeType == other.runtimeType &&
|
|
||||||
mode == other.mode &&
|
|
||||||
acceptList == other.acceptList &&
|
|
||||||
rejectList == other.rejectList &&
|
|
||||||
isFilterSystemApp == other.isFilterSystemApp;
|
|
||||||
|
|
||||||
@override
|
|
||||||
int get hashCode =>
|
|
||||||
mode.hashCode ^
|
|
||||||
acceptList.hashCode ^
|
|
||||||
rejectList.hashCode ^
|
|
||||||
isFilterSystemApp.hashCode;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonSerializable()
|
@JsonSerializable()
|
||||||
@@ -102,13 +50,13 @@ class Config extends ChangeNotifier {
|
|||||||
_autoRun = false,
|
_autoRun = false,
|
||||||
_themeMode = ThemeMode.system,
|
_themeMode = ThemeMode.system,
|
||||||
_openLog = false,
|
_openLog = false,
|
||||||
_isCompatible = false,
|
_isCompatible = true,
|
||||||
_primaryColor = defaultPrimaryColor.value,
|
_primaryColor = defaultPrimaryColor.value,
|
||||||
_proxiesSortType = ProxiesSortType.none,
|
_proxiesSortType = ProxiesSortType.none,
|
||||||
_isMinimizeOnExit = true,
|
_isMinimizeOnExit = true,
|
||||||
_isAccessControl = false,
|
_isAccessControl = false,
|
||||||
_autoCheckUpdate = true,
|
_autoCheckUpdate = true,
|
||||||
_accessControl = AccessControl(),
|
_accessControl = const AccessControl(),
|
||||||
_isAnimateToPage = true;
|
_isAnimateToPage = true;
|
||||||
|
|
||||||
deleteProfileById(String id) {
|
deleteProfileById(String id) {
|
||||||
@@ -333,7 +281,7 @@ class Config extends ChangeNotifier {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonKey(defaultValue: false)
|
@JsonKey(defaultValue: true)
|
||||||
bool get isCompatible {
|
bool get isCompatible {
|
||||||
return _isCompatible;
|
return _isCompatible;
|
||||||
}
|
}
|
||||||
@@ -357,17 +305,18 @@ class Config extends ChangeNotifier {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
update([Config? config, RecoveryOption recoveryOptions = RecoveryOption.all]) {
|
update(
|
||||||
|
[Config? config, RecoveryOption recoveryOptions = RecoveryOption.all]) {
|
||||||
if (config != null) {
|
if (config != null) {
|
||||||
_profiles = config._profiles;
|
_profiles = config._profiles;
|
||||||
for (final profile in config._profiles) {
|
for (final profile in config._profiles) {
|
||||||
_setProfile(profile);
|
_setProfile(profile);
|
||||||
}
|
}
|
||||||
final onlyProfiles = recoveryOptions == RecoveryOption.onlyProfiles;
|
final onlyProfiles = recoveryOptions == RecoveryOption.onlyProfiles;
|
||||||
if(_currentProfileId == null && onlyProfiles && profiles.isNotEmpty){
|
if (_currentProfileId == null && onlyProfiles && profiles.isNotEmpty) {
|
||||||
_currentProfileId = _profiles.first.id;
|
_currentProfileId = _profiles.first.id;
|
||||||
}
|
}
|
||||||
if(onlyProfiles) return;
|
if (onlyProfiles) return;
|
||||||
_currentProfileId = config._currentProfileId;
|
_currentProfileId = config._currentProfileId;
|
||||||
_isCompatible = config._isCompatible;
|
_isCompatible = config._isCompatible;
|
||||||
_autoLaunch = config._autoLaunch;
|
_autoLaunch = config._autoLaunch;
|
||||||
|
|||||||
@@ -75,3 +75,16 @@ class Process with _$Process {
|
|||||||
factory Process.fromJson(Map<String, Object?> json) =>
|
factory Process.fromJson(Map<String, Object?> json) =>
|
||||||
_$ProcessFromJson(json);
|
_$ProcessFromJson(json);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@freezed
|
||||||
|
class ExternalProvider with _$ExternalProvider {
|
||||||
|
const factory ExternalProvider({
|
||||||
|
required String name,
|
||||||
|
required String type,
|
||||||
|
@JsonKey(name: "vehicle-type") required String vehicleType,
|
||||||
|
@JsonKey(name: "update-at") required DateTime updateAt,
|
||||||
|
}) = _ExternalProvider;
|
||||||
|
|
||||||
|
factory ExternalProvider.fromJson(Map<String, Object?> json) =>
|
||||||
|
_$ExternalProviderFromJson(json);
|
||||||
|
}
|
||||||
|
|||||||
241
lib/models/generated/config.freezed.dart
Normal file
241
lib/models/generated/config.freezed.dart
Normal 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;
|
||||||
|
}
|
||||||
@@ -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>))
|
||||||
@@ -93,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',
|
||||||
|
};
|
||||||
|
|||||||
@@ -1029,3 +1029,214 @@ abstract class _Process implements Process {
|
|||||||
_$$ProcessImplCopyWith<_$ProcessImpl> get copyWith =>
|
_$$ProcessImplCopyWith<_$ProcessImpl> get copyWith =>
|
||||||
throw _privateConstructorUsedError;
|
throw _privateConstructorUsedError;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ExternalProvider _$ExternalProviderFromJson(Map<String, dynamic> json) {
|
||||||
|
return _ExternalProvider.fromJson(json);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// @nodoc
|
||||||
|
mixin _$ExternalProvider {
|
||||||
|
String get name => throw _privateConstructorUsedError;
|
||||||
|
String get type => throw _privateConstructorUsedError;
|
||||||
|
@JsonKey(name: "vehicle-type")
|
||||||
|
String get vehicleType => throw _privateConstructorUsedError;
|
||||||
|
@JsonKey(name: "update-at")
|
||||||
|
DateTime get updateAt => throw _privateConstructorUsedError;
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
|
||||||
|
@JsonKey(ignore: true)
|
||||||
|
$ExternalProviderCopyWith<ExternalProvider> get copyWith =>
|
||||||
|
throw _privateConstructorUsedError;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// @nodoc
|
||||||
|
abstract class $ExternalProviderCopyWith<$Res> {
|
||||||
|
factory $ExternalProviderCopyWith(
|
||||||
|
ExternalProvider value, $Res Function(ExternalProvider) then) =
|
||||||
|
_$ExternalProviderCopyWithImpl<$Res, ExternalProvider>;
|
||||||
|
@useResult
|
||||||
|
$Res call(
|
||||||
|
{String name,
|
||||||
|
String type,
|
||||||
|
@JsonKey(name: "vehicle-type") String vehicleType,
|
||||||
|
@JsonKey(name: "update-at") DateTime updateAt});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// @nodoc
|
||||||
|
class _$ExternalProviderCopyWithImpl<$Res, $Val extends ExternalProvider>
|
||||||
|
implements $ExternalProviderCopyWith<$Res> {
|
||||||
|
_$ExternalProviderCopyWithImpl(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? type = null,
|
||||||
|
Object? vehicleType = null,
|
||||||
|
Object? updateAt = null,
|
||||||
|
}) {
|
||||||
|
return _then(_value.copyWith(
|
||||||
|
name: null == name
|
||||||
|
? _value.name
|
||||||
|
: name // ignore: cast_nullable_to_non_nullable
|
||||||
|
as String,
|
||||||
|
type: null == type
|
||||||
|
? _value.type
|
||||||
|
: type // ignore: cast_nullable_to_non_nullable
|
||||||
|
as String,
|
||||||
|
vehicleType: null == vehicleType
|
||||||
|
? _value.vehicleType
|
||||||
|
: vehicleType // ignore: cast_nullable_to_non_nullable
|
||||||
|
as String,
|
||||||
|
updateAt: null == updateAt
|
||||||
|
? _value.updateAt
|
||||||
|
: updateAt // ignore: cast_nullable_to_non_nullable
|
||||||
|
as DateTime,
|
||||||
|
) as $Val);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// @nodoc
|
||||||
|
abstract class _$$ExternalProviderImplCopyWith<$Res>
|
||||||
|
implements $ExternalProviderCopyWith<$Res> {
|
||||||
|
factory _$$ExternalProviderImplCopyWith(_$ExternalProviderImpl value,
|
||||||
|
$Res Function(_$ExternalProviderImpl) then) =
|
||||||
|
__$$ExternalProviderImplCopyWithImpl<$Res>;
|
||||||
|
@override
|
||||||
|
@useResult
|
||||||
|
$Res call(
|
||||||
|
{String name,
|
||||||
|
String type,
|
||||||
|
@JsonKey(name: "vehicle-type") String vehicleType,
|
||||||
|
@JsonKey(name: "update-at") DateTime updateAt});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// @nodoc
|
||||||
|
class __$$ExternalProviderImplCopyWithImpl<$Res>
|
||||||
|
extends _$ExternalProviderCopyWithImpl<$Res, _$ExternalProviderImpl>
|
||||||
|
implements _$$ExternalProviderImplCopyWith<$Res> {
|
||||||
|
__$$ExternalProviderImplCopyWithImpl(_$ExternalProviderImpl _value,
|
||||||
|
$Res Function(_$ExternalProviderImpl) _then)
|
||||||
|
: super(_value, _then);
|
||||||
|
|
||||||
|
@pragma('vm:prefer-inline')
|
||||||
|
@override
|
||||||
|
$Res call({
|
||||||
|
Object? name = null,
|
||||||
|
Object? type = null,
|
||||||
|
Object? vehicleType = null,
|
||||||
|
Object? updateAt = null,
|
||||||
|
}) {
|
||||||
|
return _then(_$ExternalProviderImpl(
|
||||||
|
name: null == name
|
||||||
|
? _value.name
|
||||||
|
: name // ignore: cast_nullable_to_non_nullable
|
||||||
|
as String,
|
||||||
|
type: null == type
|
||||||
|
? _value.type
|
||||||
|
: type // ignore: cast_nullable_to_non_nullable
|
||||||
|
as String,
|
||||||
|
vehicleType: null == vehicleType
|
||||||
|
? _value.vehicleType
|
||||||
|
: vehicleType // ignore: cast_nullable_to_non_nullable
|
||||||
|
as String,
|
||||||
|
updateAt: null == updateAt
|
||||||
|
? _value.updateAt
|
||||||
|
: updateAt // ignore: cast_nullable_to_non_nullable
|
||||||
|
as DateTime,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// @nodoc
|
||||||
|
@JsonSerializable()
|
||||||
|
class _$ExternalProviderImpl implements _ExternalProvider {
|
||||||
|
const _$ExternalProviderImpl(
|
||||||
|
{required this.name,
|
||||||
|
required this.type,
|
||||||
|
@JsonKey(name: "vehicle-type") required this.vehicleType,
|
||||||
|
@JsonKey(name: "update-at") required this.updateAt});
|
||||||
|
|
||||||
|
factory _$ExternalProviderImpl.fromJson(Map<String, dynamic> json) =>
|
||||||
|
_$$ExternalProviderImplFromJson(json);
|
||||||
|
|
||||||
|
@override
|
||||||
|
final String name;
|
||||||
|
@override
|
||||||
|
final String type;
|
||||||
|
@override
|
||||||
|
@JsonKey(name: "vehicle-type")
|
||||||
|
final String vehicleType;
|
||||||
|
@override
|
||||||
|
@JsonKey(name: "update-at")
|
||||||
|
final DateTime updateAt;
|
||||||
|
|
||||||
|
@override
|
||||||
|
String toString() {
|
||||||
|
return 'ExternalProvider(name: $name, type: $type, vehicleType: $vehicleType, updateAt: $updateAt)';
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool operator ==(Object other) {
|
||||||
|
return identical(this, other) ||
|
||||||
|
(other.runtimeType == runtimeType &&
|
||||||
|
other is _$ExternalProviderImpl &&
|
||||||
|
(identical(other.name, name) || other.name == name) &&
|
||||||
|
(identical(other.type, type) || other.type == type) &&
|
||||||
|
(identical(other.vehicleType, vehicleType) ||
|
||||||
|
other.vehicleType == vehicleType) &&
|
||||||
|
(identical(other.updateAt, updateAt) ||
|
||||||
|
other.updateAt == updateAt));
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonKey(ignore: true)
|
||||||
|
@override
|
||||||
|
int get hashCode =>
|
||||||
|
Object.hash(runtimeType, name, type, vehicleType, updateAt);
|
||||||
|
|
||||||
|
@JsonKey(ignore: true)
|
||||||
|
@override
|
||||||
|
@pragma('vm:prefer-inline')
|
||||||
|
_$$ExternalProviderImplCopyWith<_$ExternalProviderImpl> get copyWith =>
|
||||||
|
__$$ExternalProviderImplCopyWithImpl<_$ExternalProviderImpl>(
|
||||||
|
this, _$identity);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Map<String, dynamic> toJson() {
|
||||||
|
return _$$ExternalProviderImplToJson(
|
||||||
|
this,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
abstract class _ExternalProvider implements ExternalProvider {
|
||||||
|
const factory _ExternalProvider(
|
||||||
|
{required final String name,
|
||||||
|
required final String type,
|
||||||
|
@JsonKey(name: "vehicle-type") required final String vehicleType,
|
||||||
|
@JsonKey(name: "update-at") required final DateTime updateAt}) =
|
||||||
|
_$ExternalProviderImpl;
|
||||||
|
|
||||||
|
factory _ExternalProvider.fromJson(Map<String, dynamic> json) =
|
||||||
|
_$ExternalProviderImpl.fromJson;
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get name;
|
||||||
|
@override
|
||||||
|
String get type;
|
||||||
|
@override
|
||||||
|
@JsonKey(name: "vehicle-type")
|
||||||
|
String get vehicleType;
|
||||||
|
@override
|
||||||
|
@JsonKey(name: "update-at")
|
||||||
|
DateTime get updateAt;
|
||||||
|
@override
|
||||||
|
@JsonKey(ignore: true)
|
||||||
|
_$$ExternalProviderImplCopyWith<_$ExternalProviderImpl> get copyWith =>
|
||||||
|
throw _privateConstructorUsedError;
|
||||||
|
}
|
||||||
|
|||||||
@@ -94,3 +94,21 @@ Map<String, dynamic> _$$ProcessImplToJson(_$ProcessImpl instance) =>
|
|||||||
'source': instance.source,
|
'source': instance.source,
|
||||||
'target': instance.target,
|
'target': instance.target,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
_$ExternalProviderImpl _$$ExternalProviderImplFromJson(
|
||||||
|
Map<String, dynamic> json) =>
|
||||||
|
_$ExternalProviderImpl(
|
||||||
|
name: json['name'] as String,
|
||||||
|
type: json['type'] as String,
|
||||||
|
vehicleType: json['vehicle-type'] as String,
|
||||||
|
updateAt: DateTime.parse(json['update-at'] as String),
|
||||||
|
);
|
||||||
|
|
||||||
|
Map<String, dynamic> _$$ExternalProviderImplToJson(
|
||||||
|
_$ExternalProviderImpl instance) =>
|
||||||
|
<String, dynamic>{
|
||||||
|
'name': instance.name,
|
||||||
|
'type': instance.type,
|
||||||
|
'vehicle-type': instance.vehicleType,
|
||||||
|
'update-at': instance.updateAt.toIso8601String(),
|
||||||
|
};
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ mixin _$NavigationItem {
|
|||||||
String get label => throw _privateConstructorUsedError;
|
String get label => throw _privateConstructorUsedError;
|
||||||
String? get description => throw _privateConstructorUsedError;
|
String? get description => throw _privateConstructorUsedError;
|
||||||
Widget get fragment => throw _privateConstructorUsedError;
|
Widget get fragment => throw _privateConstructorUsedError;
|
||||||
|
bool get keep => throw _privateConstructorUsedError;
|
||||||
String? get path => throw _privateConstructorUsedError;
|
String? get path => throw _privateConstructorUsedError;
|
||||||
List<NavigationItemMode> get modes => throw _privateConstructorUsedError;
|
List<NavigationItemMode> get modes => throw _privateConstructorUsedError;
|
||||||
|
|
||||||
@@ -39,6 +40,7 @@ abstract class $NavigationItemCopyWith<$Res> {
|
|||||||
String label,
|
String label,
|
||||||
String? description,
|
String? description,
|
||||||
Widget fragment,
|
Widget fragment,
|
||||||
|
bool keep,
|
||||||
String? path,
|
String? path,
|
||||||
List<NavigationItemMode> modes});
|
List<NavigationItemMode> modes});
|
||||||
}
|
}
|
||||||
@@ -60,6 +62,7 @@ class _$NavigationItemCopyWithImpl<$Res, $Val extends NavigationItem>
|
|||||||
Object? label = null,
|
Object? label = null,
|
||||||
Object? description = freezed,
|
Object? description = freezed,
|
||||||
Object? fragment = null,
|
Object? fragment = null,
|
||||||
|
Object? keep = null,
|
||||||
Object? path = freezed,
|
Object? path = freezed,
|
||||||
Object? modes = null,
|
Object? modes = null,
|
||||||
}) {
|
}) {
|
||||||
@@ -80,6 +83,10 @@ class _$NavigationItemCopyWithImpl<$Res, $Val extends NavigationItem>
|
|||||||
? _value.fragment
|
? _value.fragment
|
||||||
: fragment // ignore: cast_nullable_to_non_nullable
|
: fragment // ignore: cast_nullable_to_non_nullable
|
||||||
as Widget,
|
as Widget,
|
||||||
|
keep: null == keep
|
||||||
|
? _value.keep
|
||||||
|
: keep // ignore: cast_nullable_to_non_nullable
|
||||||
|
as bool,
|
||||||
path: freezed == path
|
path: freezed == path
|
||||||
? _value.path
|
? _value.path
|
||||||
: path // ignore: cast_nullable_to_non_nullable
|
: path // ignore: cast_nullable_to_non_nullable
|
||||||
@@ -105,6 +112,7 @@ abstract class _$$NavigationItemImplCopyWith<$Res>
|
|||||||
String label,
|
String label,
|
||||||
String? description,
|
String? description,
|
||||||
Widget fragment,
|
Widget fragment,
|
||||||
|
bool keep,
|
||||||
String? path,
|
String? path,
|
||||||
List<NavigationItemMode> modes});
|
List<NavigationItemMode> modes});
|
||||||
}
|
}
|
||||||
@@ -124,6 +132,7 @@ class __$$NavigationItemImplCopyWithImpl<$Res>
|
|||||||
Object? label = null,
|
Object? label = null,
|
||||||
Object? description = freezed,
|
Object? description = freezed,
|
||||||
Object? fragment = null,
|
Object? fragment = null,
|
||||||
|
Object? keep = null,
|
||||||
Object? path = freezed,
|
Object? path = freezed,
|
||||||
Object? modes = null,
|
Object? modes = null,
|
||||||
}) {
|
}) {
|
||||||
@@ -144,6 +153,10 @@ class __$$NavigationItemImplCopyWithImpl<$Res>
|
|||||||
? _value.fragment
|
? _value.fragment
|
||||||
: fragment // ignore: cast_nullable_to_non_nullable
|
: fragment // ignore: cast_nullable_to_non_nullable
|
||||||
as Widget,
|
as Widget,
|
||||||
|
keep: null == keep
|
||||||
|
? _value.keep
|
||||||
|
: keep // ignore: cast_nullable_to_non_nullable
|
||||||
|
as bool,
|
||||||
path: freezed == path
|
path: freezed == path
|
||||||
? _value.path
|
? _value.path
|
||||||
: path // ignore: cast_nullable_to_non_nullable
|
: path // ignore: cast_nullable_to_non_nullable
|
||||||
@@ -164,6 +177,7 @@ class _$NavigationItemImpl implements _NavigationItem {
|
|||||||
required this.label,
|
required this.label,
|
||||||
this.description,
|
this.description,
|
||||||
required this.fragment,
|
required this.fragment,
|
||||||
|
this.keep = true,
|
||||||
this.path,
|
this.path,
|
||||||
final List<NavigationItemMode> modes = const [
|
final List<NavigationItemMode> modes = const [
|
||||||
NavigationItemMode.mobile,
|
NavigationItemMode.mobile,
|
||||||
@@ -180,6 +194,9 @@ class _$NavigationItemImpl implements _NavigationItem {
|
|||||||
@override
|
@override
|
||||||
final Widget fragment;
|
final Widget fragment;
|
||||||
@override
|
@override
|
||||||
|
@JsonKey()
|
||||||
|
final bool keep;
|
||||||
|
@override
|
||||||
final String? path;
|
final String? path;
|
||||||
final List<NavigationItemMode> _modes;
|
final List<NavigationItemMode> _modes;
|
||||||
@override
|
@override
|
||||||
@@ -192,7 +209,7 @@ class _$NavigationItemImpl implements _NavigationItem {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
String toString() {
|
String toString() {
|
||||||
return 'NavigationItem(icon: $icon, label: $label, description: $description, fragment: $fragment, path: $path, modes: $modes)';
|
return 'NavigationItem(icon: $icon, label: $label, description: $description, fragment: $fragment, keep: $keep, path: $path, modes: $modes)';
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -206,13 +223,14 @@ class _$NavigationItemImpl implements _NavigationItem {
|
|||||||
other.description == description) &&
|
other.description == description) &&
|
||||||
(identical(other.fragment, fragment) ||
|
(identical(other.fragment, fragment) ||
|
||||||
other.fragment == fragment) &&
|
other.fragment == fragment) &&
|
||||||
|
(identical(other.keep, keep) || other.keep == keep) &&
|
||||||
(identical(other.path, path) || other.path == path) &&
|
(identical(other.path, path) || other.path == path) &&
|
||||||
const DeepCollectionEquality().equals(other._modes, _modes));
|
const DeepCollectionEquality().equals(other._modes, _modes));
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
int get hashCode => Object.hash(runtimeType, icon, label, description,
|
int get hashCode => Object.hash(runtimeType, icon, label, description,
|
||||||
fragment, path, const DeepCollectionEquality().hash(_modes));
|
fragment, keep, path, const DeepCollectionEquality().hash(_modes));
|
||||||
|
|
||||||
@JsonKey(ignore: true)
|
@JsonKey(ignore: true)
|
||||||
@override
|
@override
|
||||||
@@ -228,6 +246,7 @@ abstract class _NavigationItem implements NavigationItem {
|
|||||||
required final String label,
|
required final String label,
|
||||||
final String? description,
|
final String? description,
|
||||||
required final Widget fragment,
|
required final Widget fragment,
|
||||||
|
final bool keep,
|
||||||
final String? path,
|
final String? path,
|
||||||
final List<NavigationItemMode> modes}) = _$NavigationItemImpl;
|
final List<NavigationItemMode> modes}) = _$NavigationItemImpl;
|
||||||
|
|
||||||
@@ -240,6 +259,8 @@ abstract class _NavigationItem implements NavigationItem {
|
|||||||
@override
|
@override
|
||||||
Widget get fragment;
|
Widget get fragment;
|
||||||
@override
|
@override
|
||||||
|
bool get keep;
|
||||||
|
@override
|
||||||
String? get path;
|
String? get path;
|
||||||
@override
|
@override
|
||||||
List<NavigationItemMode> get modes;
|
List<NavigationItemMode> get modes;
|
||||||
|
|||||||
@@ -667,155 +667,6 @@ abstract class _ProfilesSelectorState implements ProfilesSelectorState {
|
|||||||
get copyWith => throw _privateConstructorUsedError;
|
get copyWith => throw _privateConstructorUsedError;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// @nodoc
|
|
||||||
mixin _$PackageListSelectorState {
|
|
||||||
AccessControl get accessControl => throw _privateConstructorUsedError;
|
|
||||||
List<Package> get packages => throw _privateConstructorUsedError;
|
|
||||||
|
|
||||||
@JsonKey(ignore: true)
|
|
||||||
$PackageListSelectorStateCopyWith<PackageListSelectorState> get copyWith =>
|
|
||||||
throw _privateConstructorUsedError;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// @nodoc
|
|
||||||
abstract class $PackageListSelectorStateCopyWith<$Res> {
|
|
||||||
factory $PackageListSelectorStateCopyWith(PackageListSelectorState value,
|
|
||||||
$Res Function(PackageListSelectorState) then) =
|
|
||||||
_$PackageListSelectorStateCopyWithImpl<$Res, PackageListSelectorState>;
|
|
||||||
@useResult
|
|
||||||
$Res call({AccessControl accessControl, List<Package> packages});
|
|
||||||
}
|
|
||||||
|
|
||||||
/// @nodoc
|
|
||||||
class _$PackageListSelectorStateCopyWithImpl<$Res,
|
|
||||||
$Val extends PackageListSelectorState>
|
|
||||||
implements $PackageListSelectorStateCopyWith<$Res> {
|
|
||||||
_$PackageListSelectorStateCopyWithImpl(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? accessControl = null,
|
|
||||||
Object? packages = null,
|
|
||||||
}) {
|
|
||||||
return _then(_value.copyWith(
|
|
||||||
accessControl: null == accessControl
|
|
||||||
? _value.accessControl
|
|
||||||
: accessControl // ignore: cast_nullable_to_non_nullable
|
|
||||||
as AccessControl,
|
|
||||||
packages: null == packages
|
|
||||||
? _value.packages
|
|
||||||
: packages // ignore: cast_nullable_to_non_nullable
|
|
||||||
as List<Package>,
|
|
||||||
) as $Val);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// @nodoc
|
|
||||||
abstract class _$$PackageListSelectorStateImplCopyWith<$Res>
|
|
||||||
implements $PackageListSelectorStateCopyWith<$Res> {
|
|
||||||
factory _$$PackageListSelectorStateImplCopyWith(
|
|
||||||
_$PackageListSelectorStateImpl value,
|
|
||||||
$Res Function(_$PackageListSelectorStateImpl) then) =
|
|
||||||
__$$PackageListSelectorStateImplCopyWithImpl<$Res>;
|
|
||||||
@override
|
|
||||||
@useResult
|
|
||||||
$Res call({AccessControl accessControl, List<Package> packages});
|
|
||||||
}
|
|
||||||
|
|
||||||
/// @nodoc
|
|
||||||
class __$$PackageListSelectorStateImplCopyWithImpl<$Res>
|
|
||||||
extends _$PackageListSelectorStateCopyWithImpl<$Res,
|
|
||||||
_$PackageListSelectorStateImpl>
|
|
||||||
implements _$$PackageListSelectorStateImplCopyWith<$Res> {
|
|
||||||
__$$PackageListSelectorStateImplCopyWithImpl(
|
|
||||||
_$PackageListSelectorStateImpl _value,
|
|
||||||
$Res Function(_$PackageListSelectorStateImpl) _then)
|
|
||||||
: super(_value, _then);
|
|
||||||
|
|
||||||
@pragma('vm:prefer-inline')
|
|
||||||
@override
|
|
||||||
$Res call({
|
|
||||||
Object? accessControl = null,
|
|
||||||
Object? packages = null,
|
|
||||||
}) {
|
|
||||||
return _then(_$PackageListSelectorStateImpl(
|
|
||||||
accessControl: null == accessControl
|
|
||||||
? _value.accessControl
|
|
||||||
: accessControl // ignore: cast_nullable_to_non_nullable
|
|
||||||
as AccessControl,
|
|
||||||
packages: null == packages
|
|
||||||
? _value._packages
|
|
||||||
: packages // ignore: cast_nullable_to_non_nullable
|
|
||||||
as List<Package>,
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// @nodoc
|
|
||||||
|
|
||||||
class _$PackageListSelectorStateImpl implements _PackageListSelectorState {
|
|
||||||
const _$PackageListSelectorStateImpl(
|
|
||||||
{required this.accessControl, required final List<Package> packages})
|
|
||||||
: _packages = packages;
|
|
||||||
|
|
||||||
@override
|
|
||||||
final AccessControl accessControl;
|
|
||||||
final List<Package> _packages;
|
|
||||||
@override
|
|
||||||
List<Package> get packages {
|
|
||||||
if (_packages is EqualUnmodifiableListView) return _packages;
|
|
||||||
// ignore: implicit_dynamic_type
|
|
||||||
return EqualUnmodifiableListView(_packages);
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
String toString() {
|
|
||||||
return 'PackageListSelectorState(accessControl: $accessControl, packages: $packages)';
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
bool operator ==(Object other) {
|
|
||||||
return identical(this, other) ||
|
|
||||||
(other.runtimeType == runtimeType &&
|
|
||||||
other is _$PackageListSelectorStateImpl &&
|
|
||||||
(identical(other.accessControl, accessControl) ||
|
|
||||||
other.accessControl == accessControl) &&
|
|
||||||
const DeepCollectionEquality().equals(other._packages, _packages));
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
int get hashCode => Object.hash(runtimeType, accessControl,
|
|
||||||
const DeepCollectionEquality().hash(_packages));
|
|
||||||
|
|
||||||
@JsonKey(ignore: true)
|
|
||||||
@override
|
|
||||||
@pragma('vm:prefer-inline')
|
|
||||||
_$$PackageListSelectorStateImplCopyWith<_$PackageListSelectorStateImpl>
|
|
||||||
get copyWith => __$$PackageListSelectorStateImplCopyWithImpl<
|
|
||||||
_$PackageListSelectorStateImpl>(this, _$identity);
|
|
||||||
}
|
|
||||||
|
|
||||||
abstract class _PackageListSelectorState implements PackageListSelectorState {
|
|
||||||
const factory _PackageListSelectorState(
|
|
||||||
{required final AccessControl accessControl,
|
|
||||||
required final List<Package> packages}) = _$PackageListSelectorStateImpl;
|
|
||||||
|
|
||||||
@override
|
|
||||||
AccessControl get accessControl;
|
|
||||||
@override
|
|
||||||
List<Package> get packages;
|
|
||||||
@override
|
|
||||||
@JsonKey(ignore: true)
|
|
||||||
_$$PackageListSelectorStateImplCopyWith<_$PackageListSelectorStateImpl>
|
|
||||||
get copyWith => throw _privateConstructorUsedError;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// @nodoc
|
/// @nodoc
|
||||||
mixin _$ApplicationSelectorState {
|
mixin _$ApplicationSelectorState {
|
||||||
String? get locale => throw _privateConstructorUsedError;
|
String? get locale => throw _privateConstructorUsedError;
|
||||||
@@ -2219,3 +2070,159 @@ abstract class _MoreToolsSelectorState implements MoreToolsSelectorState {
|
|||||||
_$$MoreToolsSelectorStateImplCopyWith<_$MoreToolsSelectorStateImpl>
|
_$$MoreToolsSelectorStateImplCopyWith<_$MoreToolsSelectorStateImpl>
|
||||||
get copyWith => throw _privateConstructorUsedError;
|
get copyWith => throw _privateConstructorUsedError;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// @nodoc
|
||||||
|
mixin _$PackageListSelectorState {
|
||||||
|
AccessControl get accessControl => throw _privateConstructorUsedError;
|
||||||
|
bool get isAccessControl => throw _privateConstructorUsedError;
|
||||||
|
|
||||||
|
@JsonKey(ignore: true)
|
||||||
|
$PackageListSelectorStateCopyWith<PackageListSelectorState> get copyWith =>
|
||||||
|
throw _privateConstructorUsedError;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// @nodoc
|
||||||
|
abstract class $PackageListSelectorStateCopyWith<$Res> {
|
||||||
|
factory $PackageListSelectorStateCopyWith(PackageListSelectorState value,
|
||||||
|
$Res Function(PackageListSelectorState) then) =
|
||||||
|
_$PackageListSelectorStateCopyWithImpl<$Res, PackageListSelectorState>;
|
||||||
|
@useResult
|
||||||
|
$Res call({AccessControl accessControl, bool isAccessControl});
|
||||||
|
|
||||||
|
$AccessControlCopyWith<$Res> get accessControl;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// @nodoc
|
||||||
|
class _$PackageListSelectorStateCopyWithImpl<$Res,
|
||||||
|
$Val extends PackageListSelectorState>
|
||||||
|
implements $PackageListSelectorStateCopyWith<$Res> {
|
||||||
|
_$PackageListSelectorStateCopyWithImpl(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? accessControl = null,
|
||||||
|
Object? isAccessControl = null,
|
||||||
|
}) {
|
||||||
|
return _then(_value.copyWith(
|
||||||
|
accessControl: null == accessControl
|
||||||
|
? _value.accessControl
|
||||||
|
: accessControl // ignore: cast_nullable_to_non_nullable
|
||||||
|
as AccessControl,
|
||||||
|
isAccessControl: null == isAccessControl
|
||||||
|
? _value.isAccessControl
|
||||||
|
: isAccessControl // ignore: cast_nullable_to_non_nullable
|
||||||
|
as bool,
|
||||||
|
) as $Val);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
@pragma('vm:prefer-inline')
|
||||||
|
$AccessControlCopyWith<$Res> get accessControl {
|
||||||
|
return $AccessControlCopyWith<$Res>(_value.accessControl, (value) {
|
||||||
|
return _then(_value.copyWith(accessControl: value) as $Val);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// @nodoc
|
||||||
|
abstract class _$$PackageListSelectorStateImplCopyWith<$Res>
|
||||||
|
implements $PackageListSelectorStateCopyWith<$Res> {
|
||||||
|
factory _$$PackageListSelectorStateImplCopyWith(
|
||||||
|
_$PackageListSelectorStateImpl value,
|
||||||
|
$Res Function(_$PackageListSelectorStateImpl) then) =
|
||||||
|
__$$PackageListSelectorStateImplCopyWithImpl<$Res>;
|
||||||
|
@override
|
||||||
|
@useResult
|
||||||
|
$Res call({AccessControl accessControl, bool isAccessControl});
|
||||||
|
|
||||||
|
@override
|
||||||
|
$AccessControlCopyWith<$Res> get accessControl;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// @nodoc
|
||||||
|
class __$$PackageListSelectorStateImplCopyWithImpl<$Res>
|
||||||
|
extends _$PackageListSelectorStateCopyWithImpl<$Res,
|
||||||
|
_$PackageListSelectorStateImpl>
|
||||||
|
implements _$$PackageListSelectorStateImplCopyWith<$Res> {
|
||||||
|
__$$PackageListSelectorStateImplCopyWithImpl(
|
||||||
|
_$PackageListSelectorStateImpl _value,
|
||||||
|
$Res Function(_$PackageListSelectorStateImpl) _then)
|
||||||
|
: super(_value, _then);
|
||||||
|
|
||||||
|
@pragma('vm:prefer-inline')
|
||||||
|
@override
|
||||||
|
$Res call({
|
||||||
|
Object? accessControl = null,
|
||||||
|
Object? isAccessControl = null,
|
||||||
|
}) {
|
||||||
|
return _then(_$PackageListSelectorStateImpl(
|
||||||
|
accessControl: null == accessControl
|
||||||
|
? _value.accessControl
|
||||||
|
: accessControl // ignore: cast_nullable_to_non_nullable
|
||||||
|
as AccessControl,
|
||||||
|
isAccessControl: null == isAccessControl
|
||||||
|
? _value.isAccessControl
|
||||||
|
: isAccessControl // ignore: cast_nullable_to_non_nullable
|
||||||
|
as bool,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// @nodoc
|
||||||
|
|
||||||
|
class _$PackageListSelectorStateImpl implements _PackageListSelectorState {
|
||||||
|
const _$PackageListSelectorStateImpl(
|
||||||
|
{required this.accessControl, required this.isAccessControl});
|
||||||
|
|
||||||
|
@override
|
||||||
|
final AccessControl accessControl;
|
||||||
|
@override
|
||||||
|
final bool isAccessControl;
|
||||||
|
|
||||||
|
@override
|
||||||
|
String toString() {
|
||||||
|
return 'PackageListSelectorState(accessControl: $accessControl, isAccessControl: $isAccessControl)';
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool operator ==(Object other) {
|
||||||
|
return identical(this, other) ||
|
||||||
|
(other.runtimeType == runtimeType &&
|
||||||
|
other is _$PackageListSelectorStateImpl &&
|
||||||
|
(identical(other.accessControl, accessControl) ||
|
||||||
|
other.accessControl == accessControl) &&
|
||||||
|
(identical(other.isAccessControl, isAccessControl) ||
|
||||||
|
other.isAccessControl == isAccessControl));
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
int get hashCode => Object.hash(runtimeType, accessControl, isAccessControl);
|
||||||
|
|
||||||
|
@JsonKey(ignore: true)
|
||||||
|
@override
|
||||||
|
@pragma('vm:prefer-inline')
|
||||||
|
_$$PackageListSelectorStateImplCopyWith<_$PackageListSelectorStateImpl>
|
||||||
|
get copyWith => __$$PackageListSelectorStateImplCopyWithImpl<
|
||||||
|
_$PackageListSelectorStateImpl>(this, _$identity);
|
||||||
|
}
|
||||||
|
|
||||||
|
abstract class _PackageListSelectorState implements PackageListSelectorState {
|
||||||
|
const factory _PackageListSelectorState(
|
||||||
|
{required final AccessControl accessControl,
|
||||||
|
required final bool isAccessControl}) = _$PackageListSelectorStateImpl;
|
||||||
|
|
||||||
|
@override
|
||||||
|
AccessControl get accessControl;
|
||||||
|
@override
|
||||||
|
bool get isAccessControl;
|
||||||
|
@override
|
||||||
|
@JsonKey(ignore: true)
|
||||||
|
_$$PackageListSelectorStateImplCopyWith<_$PackageListSelectorStateImpl>
|
||||||
|
get copyWith => throw _privateConstructorUsedError;
|
||||||
|
}
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ export 'log.dart';
|
|||||||
export 'system_color_scheme.dart';
|
export 'system_color_scheme.dart';
|
||||||
export 'connection.dart';
|
export 'connection.dart';
|
||||||
export 'package.dart';
|
export 'package.dart';
|
||||||
export 'common.dart';
|
|
||||||
export 'ffi.dart';
|
export 'ffi.dart';
|
||||||
export 'selector.dart';
|
export 'selector.dart';
|
||||||
export 'navigation.dart';
|
export 'navigation.dart';
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ class NavigationItem with _$NavigationItem {
|
|||||||
required String label,
|
required String label,
|
||||||
final String? description,
|
final String? description,
|
||||||
required Widget fragment,
|
required Widget fragment,
|
||||||
|
@Default(true) bool keep,
|
||||||
String? path,
|
String? path,
|
||||||
@Default([NavigationItemMode.mobile, NavigationItemMode.desktop])
|
@Default([NavigationItemMode.mobile, NavigationItemMode.desktop])
|
||||||
List<NavigationItemMode> modes,
|
List<NavigationItemMode> modes,
|
||||||
|
|||||||
@@ -5,11 +5,8 @@ import 'dart:typed_data';
|
|||||||
import 'package:fl_clash/clash/core.dart';
|
import 'package:fl_clash/clash/core.dart';
|
||||||
import 'package:fl_clash/enum/enum.dart';
|
import 'package:fl_clash/enum/enum.dart';
|
||||||
import 'package:fl_clash/common/common.dart';
|
import 'package:fl_clash/common/common.dart';
|
||||||
import 'package:fl_clash/models/models.dart';
|
|
||||||
import 'package:json_annotation/json_annotation.dart';
|
import 'package:json_annotation/json_annotation.dart';
|
||||||
|
|
||||||
import 'common.dart';
|
|
||||||
|
|
||||||
part 'generated/profile.g.dart';
|
part 'generated/profile.g.dart';
|
||||||
|
|
||||||
typedef SelectedMap = Map<String, String>;
|
typedef SelectedMap = Map<String, String>;
|
||||||
@@ -83,44 +80,31 @@ class Profile {
|
|||||||
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 ?? defaultUpdateDuration,
|
||||||
autoUpdateDuration ?? defaultUpdateDuration,
|
|
||||||
selectedMap = selectedMap ?? {};
|
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 {
|
Future<void> checkAndUpdate() async {
|
||||||
final isExists = await check();
|
final isExists = await check();
|
||||||
if(!isExists){
|
if (!isExists) {
|
||||||
if(url != null){
|
if (url != null) {
|
||||||
return await update();
|
return await update();
|
||||||
}
|
}
|
||||||
return Result.error();
|
|
||||||
}
|
}
|
||||||
return Result.success();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<Result<bool>> update() async {
|
Future<void> update() async {
|
||||||
if (url == null) {
|
if (url == null) {
|
||||||
return Result.error(
|
throw appLocalizations.unableToUpdateCurrentProfileDesc;
|
||||||
appLocalizations.unableToUpdateCurrentProfileDesc,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
final responseResult = await Request.getFileResponseForUrl(url!);
|
final response = await request.getFileResponseForUrl(url!);
|
||||||
final response = responseResult.data;
|
final disposition = response.headers.value("content-disposition");
|
||||||
if (responseResult.type != ResultType.success || response == null) {
|
|
||||||
return Result.error(responseResult.message);
|
|
||||||
}
|
|
||||||
final disposition = response.headers['content-disposition'];
|
|
||||||
label ??= other.getFileNameForDisposition(disposition) ?? id;
|
label ??= other.getFileNameForDisposition(disposition) ?? id;
|
||||||
final userinfo = response.headers['subscription-userinfo'];
|
final userinfo = response.headers.value('subscription-userinfo');
|
||||||
userInfo = UserInfo.formHString(userinfo);
|
userInfo = UserInfo.formHString(userinfo);
|
||||||
final saveResult = await saveFile(response.bodyBytes);
|
await saveFile(response.data);
|
||||||
if (saveResult.type == ResultType.error) {
|
|
||||||
return Result.error(saveResult.message);
|
|
||||||
}
|
|
||||||
lastUpdateDate = DateTime.now();
|
lastUpdateDate = DateTime.now();
|
||||||
return Result.success();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<bool> check() async {
|
Future<bool> check() async {
|
||||||
@@ -128,10 +112,10 @@ class Profile {
|
|||||||
return await File(profilePath!).exists();
|
return await File(profilePath!).exists();
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<Result<void>> saveFile(Uint8List bytes) async {
|
Future<void> saveFile(Uint8List bytes) async {
|
||||||
final isValidate = clashCore.validateConfig(utf8.decode(bytes));
|
final message = await clashCore.validateConfig(utf8.decode(bytes));
|
||||||
if (!isValidate) {
|
if (message.isNotEmpty) {
|
||||||
return Result.error(appLocalizations.profileParseErrorDesc);
|
throw message;
|
||||||
}
|
}
|
||||||
final path = await appPath.getProfilePath(id);
|
final path = await appPath.getProfilePath(id);
|
||||||
final file = File(path!);
|
final file = File(path!);
|
||||||
@@ -141,7 +125,6 @@ class Profile {
|
|||||||
}
|
}
|
||||||
await file.writeAsBytes(bytes);
|
await file.writeAsBytes(bytes);
|
||||||
lastUpdateDate = DateTime.now();
|
lastUpdateDate = DateTime.now();
|
||||||
return Result.success();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, dynamic> toJson() {
|
Map<String, dynamic> toJson() {
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ 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';
|
import 'proxy.dart';
|
||||||
|
|
||||||
@@ -44,14 +43,6 @@ class ProfilesSelectorState with _$ProfilesSelectorState {
|
|||||||
}) = _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({
|
||||||
@@ -126,4 +117,12 @@ class MoreToolsSelectorState with _$MoreToolsSelectorState {
|
|||||||
const factory MoreToolsSelectorState({
|
const factory MoreToolsSelectorState({
|
||||||
required List<NavigationItem> navigationItems,
|
required List<NavigationItem> navigationItems,
|
||||||
}) = _MoreToolsSelectorState;
|
}) = _MoreToolsSelectorState;
|
||||||
|
}
|
||||||
|
|
||||||
|
@freezed
|
||||||
|
class PackageListSelectorState with _$PackageListSelectorState {
|
||||||
|
const factory PackageListSelectorState({
|
||||||
|
required AccessControl accessControl,
|
||||||
|
required bool isAccessControl,
|
||||||
|
}) = _PackageListSelectorState;
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
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';
|
||||||
@@ -56,54 +57,65 @@ class HomePage extends StatelessWidget {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return PopContainer(
|
return PopContainer(
|
||||||
child: Selector2<AppState, Config, HomeSelectorState>(
|
child: LayoutBuilder(
|
||||||
selector: (_, appState, config) => HomeSelectorState(
|
builder: (_, container) {
|
||||||
currentLabel: appState.currentLabel,
|
final appController = globalState.appController;
|
||||||
navigationItems: appState.currentNavigationItems,
|
final maxWidth = container.maxWidth;
|
||||||
viewMode: appState.viewMode,
|
if (appController.appState.viewWidth != maxWidth) {
|
||||||
locale: config.locale,
|
globalState.appController.updateViewWidth(maxWidth);
|
||||||
),
|
|
||||||
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(
|
return Selector2<AppState, Config, HomeSelectorState>(
|
||||||
key: globalState.homeScaffoldKey,
|
selector: (_, appState, config) {
|
||||||
title: Intl.message(
|
return HomeSelectorState(
|
||||||
currentLabel,
|
currentLabel: appState.currentLabel,
|
||||||
|
navigationItems: appState.currentNavigationItems,
|
||||||
|
viewMode: other.getViewMode(maxWidth),
|
||||||
|
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"),
|
||||||
),
|
),
|
||||||
body: body,
|
|
||||||
bottomNavigationBar: bottomNavigationBar,
|
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
child: const HomeBody(
|
|
||||||
key: Key("home_boy"),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -120,7 +132,7 @@ class HomeBody extends StatelessWidget {
|
|||||||
final currentIndex = index == -1 ? 0 : index;
|
final currentIndex = index == -1 ? 0 : index;
|
||||||
if (globalState.pageController != null) {
|
if (globalState.pageController != null) {
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
globalState.appController.toPage(currentIndex);
|
globalState.appController.toPage(currentIndex, hasAnimate: true);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
globalState.pageController = PageController(
|
globalState.pageController = PageController(
|
||||||
@@ -146,6 +158,7 @@ class HomeBody extends StatelessWidget {
|
|||||||
itemBuilder: (_, index) {
|
itemBuilder: (_, index) {
|
||||||
final navigationItem = navigationItems[index];
|
final navigationItem = navigationItems[index];
|
||||||
return KeepContainer(
|
return KeepContainer(
|
||||||
|
keep: navigationItem.keep,
|
||||||
key: Key(navigationItem.label),
|
key: Key(navigationItem.label),
|
||||||
child: navigationItem.fragment,
|
child: navigationItem.fragment,
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ class Proxy extends ProxyPlatform {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
bool get isStart => startTime != null && startTime!.isBeforeNow();
|
bool get isStart => startTime != null && startTime!.isBeforeNow;
|
||||||
|
|
||||||
startAfterHook(int? fd) {
|
startAfterHook(int? fd) {
|
||||||
if (!isStart && fd != null) {
|
if (!isStart && fd != null) {
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ class GlobalState {
|
|||||||
timer?.cancel();
|
timer?.cancel();
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<String> updateClashConfig({
|
Future<void> updateClashConfig({
|
||||||
required ClashConfig clashConfig,
|
required ClashConfig clashConfig,
|
||||||
required Config config,
|
required Config config,
|
||||||
bool isPatch = true,
|
bool isPatch = true,
|
||||||
@@ -46,12 +46,13 @@ class GlobalState {
|
|||||||
final profilePath = await appPath.getProfilePath(config.currentProfileId);
|
final profilePath = await appPath.getProfilePath(config.currentProfileId);
|
||||||
await config.currentProfile?.checkAndUpdate();
|
await config.currentProfile?.checkAndUpdate();
|
||||||
debugPrint("update config");
|
debugPrint("update config");
|
||||||
return clashCore.updateConfig(UpdateConfigParams(
|
final res = await clashCore.updateConfig(UpdateConfigParams(
|
||||||
profilePath: profilePath,
|
profilePath: profilePath,
|
||||||
config: clashConfig,
|
config: clashConfig,
|
||||||
isPatch: isPatch,
|
isPatch: isPatch,
|
||||||
isCompatible: config.isCompatible,
|
isCompatible: config.isCompatible,
|
||||||
));
|
));
|
||||||
|
if (res.isNotEmpty) throw res;
|
||||||
}
|
}
|
||||||
|
|
||||||
updateCoreVersionInfo(AppState appState) {
|
updateCoreVersionInfo(AppState appState) {
|
||||||
@@ -76,17 +77,16 @@ class GlobalState {
|
|||||||
stopListenUpdate();
|
stopListenUpdate();
|
||||||
}
|
}
|
||||||
|
|
||||||
applyProfile({
|
Future<void> applyProfile({
|
||||||
required AppState appState,
|
required AppState appState,
|
||||||
required Config config,
|
required Config config,
|
||||||
required ClashConfig clashConfig,
|
required ClashConfig clashConfig,
|
||||||
}) async {
|
}) async {
|
||||||
final res = await updateClashConfig(
|
await updateClashConfig(
|
||||||
clashConfig: clashConfig,
|
clashConfig: clashConfig,
|
||||||
config: config,
|
config: config,
|
||||||
isPatch: false,
|
isPatch: false,
|
||||||
);
|
);
|
||||||
if (res.isNotEmpty) return Result.error(res);
|
|
||||||
await updateGroups(appState);
|
await updateGroups(appState);
|
||||||
changeProxy(
|
changeProxy(
|
||||||
appState: appState,
|
appState: appState,
|
||||||
@@ -158,18 +158,23 @@ class GlobalState {
|
|||||||
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(maxHeight: 200),
|
||||||
text: TextSpan(
|
child: SingleChildScrollView(
|
||||||
style: Theme.of(context).textTheme.labelLarge,
|
child: RichText(
|
||||||
children: [message],
|
overflow: TextOverflow.visible,
|
||||||
|
text: TextSpan(
|
||||||
|
style: Theme.of(context).textTheme.labelLarge,
|
||||||
|
children: [message],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -179,7 +184,7 @@ class GlobalState {
|
|||||||
() {
|
() {
|
||||||
Navigator.of(context).pop();
|
Navigator.of(context).pop();
|
||||||
},
|
},
|
||||||
child: Text(appLocalizations.confirm),
|
child: Text(confirmText ?? appLocalizations.confirm),
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
@@ -200,6 +205,7 @@ class GlobalState {
|
|||||||
filter: filter,
|
filter: filter,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
updateTraffic({
|
updateTraffic({
|
||||||
AppState? appState,
|
AppState? appState,
|
||||||
required Config config,
|
required Config config,
|
||||||
@@ -262,6 +268,24 @@ class GlobalState {
|
|||||||
});
|
});
|
||||||
updateCurrentDelayDebounce!([proxyName]);
|
updateCurrentDelayDebounce!([proxyName]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<T?> safeRun<T>(
|
||||||
|
FutureOr<T> Function() futureFunction, {
|
||||||
|
String? title,
|
||||||
|
}) async {
|
||||||
|
try {
|
||||||
|
final res = await futureFunction();
|
||||||
|
return res;
|
||||||
|
} catch (e) {
|
||||||
|
showMessage(
|
||||||
|
title: title ?? appLocalizations.tip,
|
||||||
|
message: TextSpan(
|
||||||
|
text: e.toString(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
final globalState = GlobalState();
|
final globalState = GlobalState();
|
||||||
|
|||||||
@@ -2,8 +2,13 @@ import 'package:flutter/material.dart';
|
|||||||
|
|
||||||
class KeepContainer extends StatefulWidget {
|
class KeepContainer extends StatefulWidget {
|
||||||
final Widget child;
|
final Widget child;
|
||||||
|
final bool keep;
|
||||||
|
|
||||||
const KeepContainer({super.key, required this.child});
|
const KeepContainer({
|
||||||
|
super.key,
|
||||||
|
required this.child,
|
||||||
|
this.keep = true,
|
||||||
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<KeepContainer> createState() => _KeepContainerState();
|
State<KeepContainer> createState() => _KeepContainerState();
|
||||||
@@ -11,7 +16,6 @@ class KeepContainer extends StatefulWidget {
|
|||||||
|
|
||||||
class _KeepContainerState extends State<KeepContainer>
|
class _KeepContainerState extends State<KeepContainer>
|
||||||
with AutomaticKeepAliveClientMixin {
|
with AutomaticKeepAliveClientMixin {
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
super.build(context);
|
super.build(context);
|
||||||
@@ -19,5 +23,5 @@ class _KeepContainerState extends State<KeepContainer>
|
|||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
bool get wantKeepAlive => true;
|
bool get wantKeepAlive => widget.keep;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,11 +27,6 @@ class _WindowContainerState extends State<WindowContainer>
|
|||||||
windowManager.addListener(this);
|
windowManager.addListener(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
|
||||||
void onWindowResize() {
|
|
||||||
globalState.appController.updateViewWidth();
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void onWindowClose() async {
|
void onWindowClose() async {
|
||||||
await globalState.appController.handleBackOrExit();
|
await globalState.appController.handleBackOrExit();
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ static void my_application_activate(GApplication* application) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
gtk_window_set_default_size(window, 1280, 720);
|
gtk_window_set_default_size(window, 1280, 720);
|
||||||
gtk_widget_realize(GTK_WIDGET(window));
|
gtk_widget_show(GTK_WIDGET(window));
|
||||||
|
|
||||||
g_autoptr(FlDartProject) project = fl_dart_project_new();
|
g_autoptr(FlDartProject) project = fl_dart_project_new();
|
||||||
fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
|
fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
|
||||||
|
|||||||
12
pubspec.lock
12
pubspec.lock
@@ -218,7 +218,7 @@ packages:
|
|||||||
source: hosted
|
source: hosted
|
||||||
version: "2.3.6"
|
version: "2.3.6"
|
||||||
dio:
|
dio:
|
||||||
dependency: transitive
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: dio
|
name: dio
|
||||||
sha256: "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5"
|
sha256: "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5"
|
||||||
@@ -269,10 +269,10 @@ packages:
|
|||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: file_picker
|
name: file_picker
|
||||||
sha256: "1bbf65dd997458a08b531042ec3794112a6c39c07c37ff22113d2e7e4f81d4e4"
|
sha256: "29c90806ac5f5fb896547720b73b17ee9aed9bba540dc5d91fe29f8c5745b10a"
|
||||||
url: "https://pub.flutter-io.cn"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "6.2.1"
|
version: "8.0.3"
|
||||||
file_selector_linux:
|
file_selector_linux:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -398,7 +398,7 @@ packages:
|
|||||||
source: hosted
|
source: hosted
|
||||||
version: "2.1.0"
|
version: "2.1.0"
|
||||||
http:
|
http:
|
||||||
dependency: "direct main"
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: http
|
name: http
|
||||||
sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
|
sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
|
||||||
@@ -433,10 +433,10 @@ packages:
|
|||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: image_picker
|
name: image_picker
|
||||||
sha256: "33974eca2e87e8b4e3727f1b94fa3abcb25afe80b6bc2c4d449a0e150aedf720"
|
sha256: "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a"
|
||||||
url: "https://pub.flutter-io.cn"
|
url: "https://pub.flutter-io.cn"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.1.1"
|
version: "1.1.2"
|
||||||
image_picker_android:
|
image_picker_android:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|||||||
10
pubspec.yaml
10
pubspec.yaml
@@ -1,7 +1,7 @@
|
|||||||
name: fl_clash
|
name: fl_clash
|
||||||
description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
|
description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
|
||||||
publish_to: 'none'
|
publish_to: 'none'
|
||||||
version: 0.8.4
|
version: 0.8.9
|
||||||
environment:
|
environment:
|
||||||
sdk: '>=3.1.0 <4.0.0'
|
sdk: '>=3.1.0 <4.0.0'
|
||||||
|
|
||||||
@@ -23,8 +23,7 @@ dependencies:
|
|||||||
launch_at_startup: ^0.2.2
|
launch_at_startup: ^0.2.2
|
||||||
windows_single_instance: ^1.0.1
|
windows_single_instance: ^1.0.1
|
||||||
json_annotation: ^4.9.0
|
json_annotation: ^4.9.0
|
||||||
http: ^1.2.0
|
file_picker: ^8.0.3
|
||||||
file_picker: ^6.1.1
|
|
||||||
mobile_scanner: 5.0.1
|
mobile_scanner: 5.0.1
|
||||||
app_links: ^3.5.0
|
app_links: ^3.5.0
|
||||||
win32_registry: ^1.1.2
|
win32_registry: ^1.1.2
|
||||||
@@ -34,10 +33,11 @@ dependencies:
|
|||||||
package_info_plus: ^7.0.0
|
package_info_plus: ^7.0.0
|
||||||
url_launcher: ^6.2.6
|
url_launcher: ^6.2.6
|
||||||
freezed_annotation: ^2.4.1
|
freezed_annotation: ^2.4.1
|
||||||
image_picker: ^1.1.1
|
image_picker: ^1.1.2
|
||||||
zxing2: ^0.2.3
|
zxing2: ^0.2.3
|
||||||
image: ^4.1.7
|
image: ^4.1.7
|
||||||
webdav_client: ^1.2.2
|
webdav_client: ^1.2.2
|
||||||
|
dio: ^5.4.3+1
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
@@ -51,7 +51,7 @@ dev_dependencies:
|
|||||||
flutter:
|
flutter:
|
||||||
uses-material-design: true
|
uses-material-design: true
|
||||||
assets:
|
assets:
|
||||||
- assets/data/geoip.metadb
|
- assets/data/
|
||||||
- assets/images/
|
- assets/images/
|
||||||
ffigen:
|
ffigen:
|
||||||
name: "ClashFFI"
|
name: "ClashFFI"
|
||||||
|
|||||||
@@ -1,13 +1,67 @@
|
|||||||
// ignore_for_file: avoid_print
|
// ignore_for_file: avoid_print
|
||||||
|
|
||||||
import 'package:http/io_client.dart';
|
|
||||||
import 'dart:io';
|
|
||||||
|
|
||||||
void main() async {
|
void main() async {
|
||||||
HttpClient httpClient = HttpClient();
|
String input = """
|
||||||
httpClient.findProxy = HttpClient.findProxyFromEnvironment;
|
您
|
||||||
|
<details markdown=1><summary>All changes from v0.8.5 to the latest commit:</summary>
|
||||||
|
|
||||||
IOClient ioClient = IOClient(httpClient);
|
|
||||||
var response = await ioClient.get(Uri.parse('https://mirror.ghproxy.com/https://raw.githubusercontent.com/Ruk1ng001/freeSub/main/clash_top30.yaml'));
|
(unreleased)
|
||||||
print(response.body);
|
------------
|
||||||
|
- Fix submit error. [chen08209]
|
||||||
|
- Add WebDAV. [chen08209]
|
||||||
|
|
||||||
|
add Auto check updates
|
||||||
|
|
||||||
|
Optimize more details
|
||||||
|
- Optimize delayTest. [chen08209]
|
||||||
|
- Upgrade flutter version. [chen08209]
|
||||||
|
- Update kernel Add import profile via QR code image. [chen08209]
|
||||||
|
- Add compatibility mode and adapt clash scheme. [chen08209]
|
||||||
|
- Update Version. [chen08209]
|
||||||
|
- Reconstruction application proxy logic. [chen08209]
|
||||||
|
- Fix Tab destroy error. [chen08209]
|
||||||
|
- Optimize repeat healthcheck. [chen08209]
|
||||||
|
- Optimize Direct mode ui. [chen08209]
|
||||||
|
- Optimize Healthcheck. [chen08209]
|
||||||
|
- Remove proxies position animation, improve performance Add Telegram
|
||||||
|
Link. [chen08209]
|
||||||
|
- Update healthcheck policy. [chen08209]
|
||||||
|
- New Check URLTest. [chen08209]
|
||||||
|
- Fix the problem of invalid auto-selection. [chen08209]
|
||||||
|
- New Async UpdateConfig. [chen08209]
|
||||||
|
- Add changeProfileDebounce. [chen08209]
|
||||||
|
- Update Workflow. [chen08209]
|
||||||
|
- Fix ChangeProfile block. [chen08209]
|
||||||
|
- Fix Release Message Error. [chen08209]
|
||||||
|
- Update Selector 2. [chen08209]
|
||||||
|
- Update Version. [chen08209]
|
||||||
|
- Fix Proxies Select Error. [chen08209]
|
||||||
|
- Fix the problem that the proxy group is empty in global mode.
|
||||||
|
[chen08209]
|
||||||
|
- Fix the problem that the proxy group is empty in global mode.
|
||||||
|
[chen08209]
|
||||||
|
- Add ProxyProvider2. [chen08209]
|
||||||
|
- Add ProxyProvider. [chen08209]
|
||||||
|
- Update Version. [chen08209]
|
||||||
|
- Update ProxyGroup Sort. [chen08209]
|
||||||
|
- Fix Android quickStart VpnService some problems. [chen08209]
|
||||||
|
- Update version. [chen08209]
|
||||||
|
- Set Android notification low importance. [chen08209]
|
||||||
|
- Fix the issue that VpnService can't be closed correctly in special
|
||||||
|
cases. [chen08209]
|
||||||
|
- Fix the problem that TileService is not destroyed correctly in some
|
||||||
|
cases. [chen08209]
|
||||||
|
|
||||||
|
Adjust tab animation defaults
|
||||||
|
- Add Telegram in README_zh_CN.md. [chen08209]
|
||||||
|
- Add Telegram. [chen08209]
|
||||||
|
""";
|
||||||
|
const pattern = r'- (.+?)\. \[.+?\]';
|
||||||
|
final regex = RegExp(pattern);
|
||||||
|
|
||||||
|
for (final match in regex.allMatches(input)) {
|
||||||
|
final change = match.group(1);
|
||||||
|
print(change);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user