Fix search issues

Fix the issues with the profile add button to cover the edit button

Adapt LoadBalance and Relay

Add arm

Fix android notification icon error

.github/workflows/build.yml

@@ -17,8 +17,8 @@ jobs:
             os: windows-latest
           - platform: linux
             os: ubuntu-latest
-          - platform: macos
-            os: macos-13
+#          - platform: macos
+#            os: macos-13
 
     steps:
       - name: Checkout
@@ -82,6 +82,7 @@ jobs:
 
 
   upload-release:
+    if: ${{ !contains(github.ref, '+') }}
     permissions: write-all
     needs: [ build ]
     runs-on: ubuntu-latest

.gitignore

@@ -31,6 +31,7 @@ migrate_working_dir/
 .pub-cache/
 .pub/
 /build/
+/dist/
 
 # Symbolication related
 app.*.symbols
@@ -44,6 +45,7 @@ app.*.map.json
 /android/app/release
 
 
+
 #libclash
 /libclash/
 

LICENSE

@@ -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>.

README.md

@@ -6,6 +6,14 @@
 
 ## 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.
 
 on Desktop:
@@ -26,6 +34,8 @@ on Mobile:
 
 💡 Based on Material You Design, [Surfboard](https://github.com/getsurfboard/surfboard)-like UI
 
+☁️ Supports data sync via WebDAV
+
 ✨ Support subscription link, Dark mode
 
 ## 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>

README_zh_CN.md

@@ -6,6 +6,14 @@
 
 ## 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的多平台代理客户端，简单易用，开源无广告。
 
 on Desktop:
@@ -26,6 +34,8 @@ on Mobile:
 
 💡 基本 Material You 设计, 类[Surfboard](https://github.com/getsurfboard/surfboard)用户界面
 
+☁️ 支持通过WebDAV同步数据
+
 ✨ 支持一键导入订阅, 深色模式
 
 ## Contact
@@ -85,4 +95,14 @@ on Mobile:
 
            ```bash
              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>

android/app/build.gradle

@@ -62,7 +62,7 @@ android {
 
     defaultConfig {
         applicationId "com.follow.clash"
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

android/app/src/main/AndroidManifest.xml

@@ -1,9 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-feature
-            android:name="android.software.leanback"
-            android:required="false" />
     <uses-feature
             android:name="android.hardware.touchscreen"
             android:required="false" />
@@ -17,12 +14,16 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"
+        tools:ignore="SystemPermissionTypo" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
 
     <application
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
+        android:extractNativeLibs="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:label="FlClash">
         <activity
             android:name="com.follow.clash.MainActivity"
@@ -72,7 +73,8 @@
         <service
             android:name=".services.FlClashTileService"
             android:exported="true"
-            android:icon="@drawable/tile_icon"
+            android:icon="@drawable/icon"
+            android:foregroundServiceType="specialUse"
             android:label="FlClash"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>

android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt

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

android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt

@@ -19,7 +19,6 @@ import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.embedding.engine.dart.DartExecutor
 
 
-@RequiresApi(Build.VERSION_CODES.N)
 class FlClashTileService : TileService() {
 
     private val observer = Observer<RunState> { runState ->
@@ -43,19 +42,27 @@ class FlClashTileService : TileService() {
         GlobalState.runState.observeForever(observer)
     }
 
-    @SuppressLint("StartActivityAndCollapseDeprecated")
     private fun activityTransfer() {
         val intent = Intent(this, TempActivity::class.java)
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        if (Build.VERSION.SDK_INT >= 34) {
-            val pendingIntent = PendingIntent.getActivity(
+        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
+            PendingIntent.getActivity(
                 this,
                 0,
                 intent,
-                PendingIntent.FLAG_IMMUTABLE
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
             )
-            startActivityAndCollapse(pendingIntent)
         } else {
+            PendingIntent.getActivity(
+                this,
+                0,
+                intent,
+                PendingIntent.FLAG_UPDATE_CURRENT
+            )
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            startActivityAndCollapse(pendingIntent)
+        }else{
             startActivityAndCollapse(intent)
         }
     }

android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt

@@ -1,10 +1,9 @@
 package com.follow.clash.services
 
-import android.annotation.SuppressLint
+import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
-import android.app.Service
 import android.content.Intent
 import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
 import android.net.ProxyInfo
@@ -13,9 +12,9 @@ import android.os.Binder
 import android.os.Build
 import android.os.IBinder
 import androidx.core.app.NotificationCompat
-import androidx.core.graphics.drawable.IconCompat
 import com.follow.clash.GlobalState
 import com.follow.clash.MainActivity
+import com.follow.clash.R
 import com.follow.clash.models.AccessControl
 import com.follow.clash.models.AccessControlMode
 
@@ -97,55 +96,63 @@ class FlClashVpnService : VpnService() {
         stopForeground()
     }
 
-    @SuppressLint("ForegroundServiceType", "WrongConstant")
+
+    private val notificationBuilder: NotificationCompat.Builder by lazy {
+        val intent = Intent(this, MainActivity::class.java)
+
+        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
+            PendingIntent.getActivity(
+                this,
+                0,
+                intent,
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            )
+        } else {
+            PendingIntent.getActivity(
+                this,
+                0,
+                intent,
+                PendingIntent.FLAG_UPDATE_CURRENT
+            )
+        }
+
+        with(NotificationCompat.Builder(this, CHANNEL)) {
+            setSmallIcon(R.drawable.ic_stat_name)
+            setContentTitle("FlClash")
+            setContentIntent(pendingIntent)
+            setCategory(NotificationCompat.CATEGORY_SERVICE)
+            priority = NotificationCompat.PRIORITY_MIN
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
+            }
+            setOngoing(true)
+            setShowWhen(false)
+            setOnlyAlertOnce(true)
+            setAutoCancel(true);
+        }
+    }
+
+
     fun startForeground(title: String, content: String) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val channel =
                 NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
             val manager = getSystemService(NotificationManager::class.java)
             manager.createNotificationChannel(channel)
-
-            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)
-
-            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)
-            }
+            channel.setShowBadge(false)
+        }
+        val notification =
+            notificationBuilder.setContentTitle(title).setContentText(content).build()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            startForeground(notificationId, notification,  FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
+        }else{
+            startForeground(notificationId, notification)
         }
     }
 
     private fun stopForeground() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            stopForeground(Service.STOP_FOREGROUND_REMOVE)
+            stopForeground(STOP_FOREGROUND_REMOVE)
         }
     }
 

android/app/src/main/res/xml/network_security_config.xml

@@ -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>

core/common.go

@@ -22,6 +22,7 @@ import (
 	"strings"
 	"sync"
 	"syscall"
+	"time"
 )
 
 type healthCheckSchema struct {
@@ -93,6 +94,13 @@ type Now struct {
 	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) {
 	var err error
 	executor.Shutdown()
@@ -317,16 +325,19 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.ExternalUI = ""
 	targetConfig.Interface = ""
 	targetConfig.ExternalUIURL = ""
+	targetConfig.GeodataMode = false
 	//targetConfig.IPv6 = patchConfig.IPv6
 	targetConfig.LogLevel = patchConfig.LogLevel
+	targetConfig.Port = 0
+	targetConfig.SocksPort = 0
+	targetConfig.MixedPort = patchConfig.MixedPort
 	targetConfig.FindProcessMode = process.FindProcessAlways
 	targetConfig.AllowLan = patchConfig.AllowLan
-	targetConfig.MixedPort = patchConfig.MixedPort
 	targetConfig.Mode = patchConfig.Mode
 	targetConfig.Tun.Enable = patchConfig.Tun.Enable
 	targetConfig.Tun.Device = patchConfig.Tun.Device
-	targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
-	targetConfig.Tun.Stack = patchConfig.Tun.Stack
+	//targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
+	//targetConfig.Tun.Stack = patchConfig.Tun.Stack
 	targetConfig.GeodataLoader = "standard"
 	targetConfig.Profile.StoreSelected = false
 	if targetConfig.DNS.Enable == false {
@@ -342,7 +353,6 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 		targetConfig.RuleProvider = make(map[string]map[string]any)
 		generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
 	}
-
 }
 
 func patchConfig(general *config.General) {
@@ -401,6 +411,6 @@ func applyConfig(isPatch bool) {
 		patchConfig(cfg.General)
 	} else {
 		executor.ApplyConfig(cfg, true)
-		healthcheck()
+		hcCompatibleProvider(tunnel.Providers())
 	}
 }

core/go.mod

@@ -1,6 +1,6 @@
 module core
 
-go 1.21.0
+go 1.20
 
 replace github.com/metacubex/mihomo => ./Clash.Meta
 
@@ -8,7 +8,7 @@ require (
 	github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34
 	github.com/metacubex/mihomo v1.17.1
 	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
 )
 
@@ -21,7 +21,7 @@ require (
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/buger/jsonparser v1.1.1 // 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/dlclark/regexp2 v1.11.0 // 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/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
-	github.com/gobwas/ws v1.3.2 // indirect
-	github.com/gofrs/uuid/v5 v5.1.0 // indirect
+	github.com/gobwas/ws v1.4.0 // indirect
+	github.com/gofrs/uuid/v5 v5.2.0 // indirect
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/go-cmp v0.6.0 // 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/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // 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/sing-quic v0.0.0-20240418004036-814c531c378d // indirect
+	github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e // 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-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-wireguard v0.0.0-20240321042214-224f96122a63 // 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/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // 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-shadowtls v0.1.4 // 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/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/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // 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
 	go.uber.org/mock v0.4.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/crypto v0.22.0 // indirect
-	golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
+	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
 	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.20.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	golang.org/x/tools v0.21.0 // indirect
+	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	lukechampine.com/blake3 v1.2.2 // indirect
+	lukechampine.com/blake3 v1.3.0 // indirect
 )

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/cilium/ebpf v0.12.3 h1:8ht6F9MquybnY97at+VDZb3eQQr8ev79RueWeVaEcG4=
 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.6/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
+github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
+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/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -35,19 +35,16 @@ github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9/go.mod h1:hkIF
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g=
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391/go.mod h1:K2R7GhgxrlJzHw2qiPWsCZXf/kXEJN9PLnQK73Ll0po=
 github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c h1:RUzBDdZ+e/HEe2Nh8lYsduiPAZygUfVXJn0Ncj5sHMg=
-github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c/go.mod h1:ETASDWf/FmEb6Ysrtd1QhjNedUU/ZQxBCRLh60bQ/UI=
 github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 h1:tlDMEdcPRQKBEz5nGDMvswiajqh7k8ogWRlhRwKy5mY=
 github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1/go.mod h1:4RfsapbGx2j/vU5xC/5/9qB3kn9Awp1YDiEnN43QrJ4=
 github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 h1:fuGucgPk5dN6wzfnxl3D0D3rVLw4v2SbBT9jb4VnxzA=
 github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010/go.mod h1:JtBcj7sBuTTRupn7c2bFspMDIObMJsVK8TeUvpShPok=
 github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
-github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
 github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
-github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
@@ -57,13 +54,12 @@ 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/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 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.3.2/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
-github.com/gofrs/uuid/v5 v5.1.0 h1:S5rqVKIigghZTCBKPCw0Y+bXkn26K3TB5mvQq2Ix8dk=
-github.com/gofrs/uuid/v5 v5.1.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
+github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
+github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
+github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
+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.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -73,7 +69,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I=
-github.com/google/tink/go v1.6.1/go.mod h1:IGW53kTgag+st5yPhKKwJ6u2l+SSp5/v9XF7spovjlY=
 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
 github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -88,9 +83,7 @@ github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6K
 github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
 github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
@@ -105,22 +98,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/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/quic-go v0.42.1-0.20240418003344-f006b5735d98 h1:oMLlJV4a9AylNo8ZLBNUiqZ02Vme6GLLHjuWJz8amSk=
-github.com/metacubex/quic-go v0.42.1-0.20240418003344-f006b5735d98/go.mod h1:iGx3Y1zynls/FjFgykLSqDcM81U0IKePRTXEz5g3iiQ=
-github.com/metacubex/sing-quic v0.0.0-20240418004036-814c531c378d h1:RAe0ND8J5SOPGI623oEXfaHKaaUrrzHx+U1DN9Awcco=
-github.com/metacubex/sing-quic v0.0.0-20240418004036-814c531c378d/go.mod h1:WyY0zYxv+o+18R/Ece+QFontlgXoobKbNqbtYn2zjz8=
+github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e h1:Nzwe08FNIJpExWpy9iXkG336dN/8nJqn69yijB7vJ8g=
+github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e/go.mod h1:uXHODgJFUfUnkkCMWLd5Er6L5QY/LFRZb9LD5jyyhsk=
+github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 h1:Wr4g1HCb5Z/QIFwFiVNjO2qL+dRu25+Mdn9xtAZZ+ew=
+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/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/go.mod h1:LCKF6j1P94zN8ZS+LXRK1gmYTVGB3squivBSXAFnOg8=
-github.com/metacubex/sing-tun v0.2.6 h1:frc58BqnIClqcC9KcYBfVAn5bgO6WW1ANKvZW3/HYAQ=
-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 h1:K4Wq3GOdLZ/xcqwyzAt4kmYQrjokyKQ3u/Xh5Yft14U=
+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/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/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/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/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
 github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
@@ -130,7 +125,6 @@ github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7/go.mod h1:U
 github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
 github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
 github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
-github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
 github.com/openacid/errors v0.8.1/go.mod h1:GUQEJJOJE3W9skHm8E8Y4phdl2LLEN8iD7c5gcGgdx0=
 github.com/openacid/low v0.1.21 h1:Tr2GNu4N/+rGRYdOsEHOE89cxUIaDViZbVmKz29uKGo=
 github.com/openacid/low v0.1.21/go.mod h1:q+MsKI6Pz2xsCkzV4BLj7NR5M4EX0sGz5AqotpZDVh0=
@@ -152,7 +146,6 @@ github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1
 github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
 github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a h1:+NkI2670SQpQWvkkD2QgdTuzQG263YZ+2emfpeyGqW0=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a/go.mod h1:63s7jpZqcDAIpj8oI/1v4Izok+npJOHACFCU6+huCkM=
 github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 h1:iL5gZI3uFp0X6EslacyapiRz7LLSJyr4RajF/BhMVyE=
@@ -166,14 +159,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/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/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/go.mod h1:YbL4TKHRR6APYQv3U2RGfwLDpPYSyWz6oUlpISBEzBE=
 github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
 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.3/go.mod h1:JpND7O217xa72ewWz9zN2eIIkPWsDN/3pl0H8Qt0uwg=
+github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU=
+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/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
@@ -223,18 +214,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=
 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.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
-golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
-golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY=
-golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
+golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
+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/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/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-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
+golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
+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.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
@@ -254,28 +245,26 @@ 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.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.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/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
-golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+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/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.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
+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/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.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
-golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
+golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
+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-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
+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 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/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/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-lukechampine.com/blake3 v1.2.2 h1:wEAbSg0IVU4ih44CVlpMqMZMpzr5hf/6aqodLlevd/w=
-lukechampine.com/blake3 v1.2.2/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
+lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
+lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=

core/hub.go

@@ -10,10 +10,13 @@ import (
 	"github.com/metacubex/mihomo/adapter/provider"
 	"github.com/metacubex/mihomo/common/structure"
 	"github.com/metacubex/mihomo/common/utils"
+	"github.com/metacubex/mihomo/component/mmdb"
 	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
+	cp "github.com/metacubex/mihomo/constant/provider"
 	"github.com/metacubex/mihomo/hub/executor"
 	"github.com/metacubex/mihomo/log"
+	rp "github.com/metacubex/mihomo/rules/provider"
 	"github.com/metacubex/mihomo/tunnel"
 	"github.com/metacubex/mihomo/tunnel/statistic"
 	"golang.org/x/net/context"
@@ -58,10 +61,17 @@ func shutdownClash() bool {
 }
 
 //export validateConfig
-func validateConfig(s *C.char) bool {
-	bytes := []byte(C.GoString(s))
-	_, err := config.UnmarshalRawConfig(bytes)
-	return err == nil
+func validateConfig(s *C.char, port C.longlong) {
+	i := int64(port)
+	go func() {
+		bytes := []byte(C.GoString(s))
+		_, err := config.UnmarshalRawConfig(bytes)
+		if err != nil {
+			bridge.SendToPort(i, err.Error())
+			return
+		}
+		bridge.SendToPort(i, "")
+	}()
 }
 
 //export updateConfig
@@ -171,7 +181,8 @@ func getTraffic() *C.char {
 }
 
 //export asyncTestDelay
-func asyncTestDelay(s *C.char) {
+func asyncTestDelay(s *C.char, port C.longlong) {
+	i := int64(port)
 	go func() {
 		paramsString := C.GoString(s)
 		var params = &TestDelayParams{}
@@ -195,26 +206,25 @@ func asyncTestDelay(s *C.char) {
 			Name: params.ProxyName,
 		}
 
-		message := bridge.Message{
-			Type: bridge.Delay,
-			Data: delayData,
-		}
-
 		if proxy == nil {
 			delayData.Value = -1
-			bridge.SendMessage(message)
+			data, _ := json.Marshal(delayData)
+			bridge.SendToPort(i, string(data))
 			return
 		}
 
 		delay, err := proxy.URLTest(ctx, constant.DefaultTestURL, expectedStatus)
 		if err != nil || delay == 0 {
 			delayData.Value = -1
-			bridge.SendMessage(message)
+			data, _ := json.Marshal(delayData)
+			bridge.SendToPort(i, string(data))
 			return
 		}
 
 		delayData.Value = int32(delay)
-		bridge.SendMessage(message)
+		data, _ := json.Marshal(delayData)
+		bridge.SendToPort(i, string(data))
+		return
 	}()
 }
 
@@ -222,7 +232,7 @@ func asyncTestDelay(s *C.char) {
 func getVersionInfo() *C.char {
 	versionInfo := map[string]string{
 		"clashName": constant.Name,
-		"version":   constant.Version,
+		"version":   "1.18.5",
 	}
 	data, err := json.Marshal(versionInfo)
 	if err != nil {
@@ -286,9 +296,82 @@ func getProvider(name *C.char) *C.char {
 	return C.CString(string(data))
 }
 
-//export healthcheck
-func healthcheck() {
-	hcCompatibleProvider(tunnel.Providers())
+//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 initNativeApiBridge

core/tun.go

@@ -17,36 +17,35 @@ var tunLock sync.Mutex
 var tun *t.Tun
 
 //export startTUN
-func startTUN(fd C.int) bool {
-	tunLock.Lock()
-	defer tunLock.Unlock()
+func startTUN(fd C.int) {
+	go func() {
+		tunLock.Lock()
+		defer tunLock.Unlock()
 
-	if tun != nil {
-		tun.Close()
-		tun = nil
-	}
-	f := int(fd)
-	gateway := "172.16.0.1/30"
-	portal := "172.16.0.2"
-	dns := "0.0.0.0"
+		if tun != nil {
+			tun.Close()
+			tun = nil
+		}
+		f := int(fd)
+		gateway := "172.16.0.1/30"
+		portal := "172.16.0.2"
+		dns := "0.0.0.0"
 
-	tempTun := &t.Tun{Closed: false, Limit: semaphore.NewWeighted(4)}
+		tempTun := &t.Tun{Closed: false, Limit: semaphore.NewWeighted(4)}
 
-	closer, err := t.Start(f, gateway, portal, dns)
+		closer, err := t.Start(f, gateway, portal, dns)
 
-	applyConfig(true)
+		applyConfig(true)
 
-	if err != nil {
-		log.Errorln("startTUN error: %v", err)
-		tempTun.Close()
-		return false
-	}
+		if err != nil {
+			log.Errorln("startTUN error: %v", err)
+			tempTun.Close()
+		}
 
-	tempTun.Closer = closer
+		tempTun.Closer = closer
 
-	tun = tempTun
-
-	return true
+		tun = tempTun
+	}()
 }
 
 //export updateMarkSocketPort
@@ -61,14 +60,16 @@ func updateMarkSocketPort(markSocketPort C.longlong) bool {
 
 //export stopTun
 func stopTun() {
-	tunLock.Lock()
-	defer tunLock.Unlock()
+	go func() {
+		tunLock.Lock()
+		defer tunLock.Unlock()
 
-	if tun != nil {
-		tun.Close()
-		applyConfig(true)
-		tun = nil
-	}
+		if tun != nil {
+			tun.Close()
+			applyConfig(true)
+			tun = nil
+		}
+	}()
 }
 
 func init() {

lib/application.dart

@@ -53,6 +53,15 @@ class Application extends StatefulWidget {
 class ApplicationState extends State<Application> {
   late SystemColorSchemes systemColorSchemes;
 
+  final _pageTransitionsTheme = const PageTransitionsTheme(
+    builders: <TargetPlatform, PageTransitionsBuilder>{
+      TargetPlatform.android: CupertinoPageTransitionsBuilder(),
+      TargetPlatform.windows: CupertinoPageTransitionsBuilder(),
+      TargetPlatform.linux: CupertinoPageTransitionsBuilder(),
+      TargetPlatform.macOS: CupertinoPageTransitionsBuilder(),
+    },
+  );
+
   ColorScheme _getAppColorScheme({
     required Brightness brightness,
     int? primaryColor,
@@ -114,7 +123,7 @@ class ApplicationState extends State<Application> {
       globalState.groupsUpdateTimer = null;
     }
     globalState.groupsUpdateTimer ??= Timer.periodic(
-      appConstant.httpTimeoutDuration,
+      httpTimeoutDuration,
       (timer) async {
         await globalState.appController.updateGroups();
         globalState.appController.appState.sortNum++;
@@ -145,13 +154,15 @@ class ApplicationState extends State<Application> {
                       GlobalCupertinoLocalizations.delegate,
                       GlobalWidgetsLocalizations.delegate
                     ],
-                    title: appConstant.name,
+                    title: appName,
                     locale: other.getLocaleForString(state.locale),
                     supportedLocales:
-                    AppLocalizations.delegate.supportedLocales,
+                        AppLocalizations.delegate.supportedLocales,
                     themeMode: state.themeMode,
                     theme: ThemeData(
                       useMaterial3: true,
+                      fontFamily: '',
+                      pageTransitionsTheme: _pageTransitionsTheme,
                       colorScheme: _getAppColorScheme(
                         brightness: Brightness.light,
                         systemColorSchemes: systemColorSchemes,
@@ -160,6 +171,8 @@ class ApplicationState extends State<Application> {
                     ),
                     darkTheme: ThemeData(
                       useMaterial3: true,
+                      fontFamily: '',
+                      pageTransitionsTheme: _pageTransitionsTheme,
                       colorScheme: _getAppColorScheme(
                         brightness: Brightness.dark,
                         systemColorSchemes: systemColorSchemes,

lib/clash/core.dart

@@ -5,9 +5,9 @@ import 'dart:io';
 import 'dart:isolate';
 
 import 'package:ffi/ffi.dart';
-import '../enum/enum.dart';
-import '../models/models.dart';
-import '../common/common.dart';
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/models.dart';
 import 'generated/clash_ffi.dart';
 
 class ClashCore {
@@ -58,11 +58,20 @@ class ClashCore {
 
   bool get isInit => clashFFI.getIsInit() == 1;
 
-  bool validateConfig(String data) {
-    return clashFFI.validateConfig(
-          data.toNativeUtf8().cast(),
-        ) ==
-        1;
+  Future<String> validateConfig(String data) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    clashFFI.validateConfig(
+      data.toNativeUtf8().cast(),
+      receiver.sendPort.nativePort,
+    );
+    return completer.future;
   }
 
   Future<String> updateConfig(UpdateConfigParams updateConfigParams) {
@@ -107,53 +116,76 @@ class ClashCore {
     });
   }
 
-  Future<DelayMap> getDelayMap() {
-    final proxiesRaw = clashFFI.getProxies();
-    final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
-    return Isolate.run<DelayMap>(() {
-      final proxies = json.decode(proxiesRawString) as Map<String, dynamic>;
-      return proxies.map<String, int?>(
-        (k, v) {
-          final history = v["history"] as List<dynamic>;
-          if (history.isEmpty) {
-            return MapEntry(
-              k,
-              null,
-            );
-          } else {
-            final delay = history.last["delay"];
-            return MapEntry(
-              k,
-              delay != 0 ? delay : -1,
-            );
-          }
-        },
-      );
+  Future<List<ExternalProvider>> getExternalProviders() {
+    final externalProvidersRaw = clashFFI.getExternalProviders();
+    final externalProvidersRawString =
+        externalProvidersRaw.cast<Utf8>().toDartString();
+    return Isolate.run<List<ExternalProvider>>(() {
+      final externalProviders =
+          (json.decode(externalProvidersRawString) as List<dynamic>)
+              .map(
+                (item) => ExternalProvider.fromJson(item),
+              )
+              .toList();
+      return externalProviders;
     });
   }
 
+  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) {
     final params = json.encode(changeProxyParams);
     return clashFFI.changeProxy(params.toNativeUtf8().cast()) == 1;
   }
 
-  bool delay(String proxyName) {
+  Future<Delay> getDelay(String proxyName) {
     final delayParams = {
       "proxy-name": proxyName,
-      "timeout": appConstant.httpTimeoutDuration.inMilliseconds,
+      "timeout": httpTimeoutDuration.inMilliseconds,
     };
-    clashFFI.asyncTestDelay(json.encode(delayParams).toNativeUtf8().cast());
-    return true;
+    final completer = Completer<Delay>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(Delay.fromJson(json.decode(message)));
+        receiver.close();
+      }
+    });
+    clashFFI.asyncTestDelay(
+      json.encode(delayParams).toNativeUtf8().cast(),
+      receiver.sendPort.nativePort,
+    );
+    Future.delayed(httpTimeoutDuration + moreDuration, () {
+      receiver.close();
+      completer.complete(
+        Delay(name: proxyName, value: -1),
+      );
+    });
+    return completer.future;
   }
 
   clearEffect(String path) {
     clashFFI.clearEffect(path.toNativeUtf8().cast());
   }
 
-  healthcheck() {
-    clashFFI.healthcheck();
-  }
-
   VersionInfo getVersionInfo() {
     final versionInfoRaw = clashFFI.getVersionInfo();
     final versionInfo = json.decode(versionInfoRaw.cast<Utf8>().toDartString());

lib/clash/generated/clash_ffi.dart

@@ -893,19 +893,22 @@ class ClashFFI {
       _lookup<ffi.NativeFunction<GoUint8 Function()>>('shutdownClash');
   late final _shutdownClash = _shutdownClashPtr.asFunction<int Function()>();
 
-  int validateConfig(
+  void validateConfig(
     ffi.Pointer<ffi.Char> s,
+    int port,
   ) {
     return _validateConfig(
       s,
+      port,
     );
   }
 
-  late final _validateConfigPtr =
-      _lookup<ffi.NativeFunction<GoUint8 Function(ffi.Pointer<ffi.Char>)>>(
-          'validateConfig');
-  late final _validateConfig =
-      _validateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>();
+  late final _validateConfigPtr = _lookup<
+      ffi.NativeFunction<
+          ffi.Void Function(
+              ffi.Pointer<ffi.Char>, ffi.LongLong)>>('validateConfig');
+  late final _validateConfig = _validateConfigPtr
+      .asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
 
   void updateConfig(
     ffi.Pointer<ffi.Char> s,
@@ -974,17 +977,20 @@ class ClashFFI {
 
   void asyncTestDelay(
     ffi.Pointer<ffi.Char> s,
+    int port,
   ) {
     return _asyncTestDelay(
       s,
+      port,
     );
   }
 
-  late final _asyncTestDelayPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
-          'asyncTestDelay');
-  late final _asyncTestDelay =
-      _asyncTestDelayPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
+  late final _asyncTestDelayPtr = _lookup<
+      ffi.NativeFunction<
+          ffi.Void Function(
+              ffi.Pointer<ffi.Char>, ffi.LongLong)>>('asyncTestDelay');
+  late final _asyncTestDelay = _asyncTestDelayPtr
+      .asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
 
   ffi.Pointer<ffi.Char> getVersionInfo() {
     return _getVersionInfo();
@@ -1054,13 +1060,34 @@ class ClashFFI {
   late final _getProvider = _getProviderPtr
       .asFunction<ffi.Pointer<ffi.Char> Function(ffi.Pointer<ffi.Char>)>();
 
-  void healthcheck() {
-    return _healthcheck();
+  ffi.Pointer<ffi.Char> getExternalProviders() {
+    return _getExternalProviders();
   }
 
-  late final _healthcheckPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function()>>('healthcheck');
-  late final _healthcheck = _healthcheckPtr.asFunction<void Function()>();
+  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 initNativeApiBridge(
     ffi.Pointer<ffi.Void> api,

lib/clash/service.dart

@@ -1,24 +1,41 @@
 import 'dart:io';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/models.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
+import 'package:path/path.dart';
 
 import 'core.dart';
 
 class ClashService {
-  Future<bool> initMmdb() async {
-    final mmdbPath = await appPath.getMMDBPath();
-    var mmdbFile = File(mmdbPath);
-    final isExists = await mmdbFile.exists();
-    if (isExists) return true;
+  Future<void> initGeo() async {
+    final homePath = await appPath.getHomeDirPath();
+    final homeDir = Directory(homePath);
+    final isExists = await homeDir.exists();
+    if (!isExists) {
+      await homeDir.create(recursive: true);
+    }
+    const geoFileNameList = [
+      mmdbFileName,
+      geoSiteFileName,
+      asnFileName,
+    ];
     try {
-      mmdbFile = await mmdbFile.create(recursive: true);
-      ByteData data = await rootBundle.load('assets/data/geoip.metadb');
-      List<int> bytes = data.buffer.asUint8List();
-      await mmdbFile.writeAsBytes(bytes, flush: true);
-      return true;
-    } catch (_) {
-      return false;
+      for (final geoFileName in geoFileNameList) {
+        final geoFile = File(
+          join(homePath, geoFileName),
+        );
+        final isExists = await geoFile.exists();
+        if (isExists) {
+          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 Config config,
   }) async {
-    final isInitMmdb = await initMmdb();
-    if (!isInitMmdb) return false;
+    await initGeo();
     final homeDirPath = await appPath.getHomeDirPath();
     final isInit = clashCore.init(homeDirPath);
     return isInit;

lib/common/constant.dart

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

lib/common/context.dart

@@ -11,8 +11,6 @@ extension BuildContextExtension on BuildContext {
     return MediaQuery.of(this).size.width;
   }
 
-  bool get isMobile => width < 600;
-
   ColorScheme get colorScheme => Theme.of(this).colorScheme;
 
   TextTheme get textTheme => Theme.of(this).textTheme;

lib/common/datetime.dart

@@ -1,5 +1,7 @@
+import 'package:fl_clash/common/app_localizations.dart';
+
 extension DateTimeExtension on DateTime {
-  bool isBeforeNow() {
+  bool get isBeforeNow {
     return isBefore(DateTime.now());
   }
 
@@ -9,4 +11,32 @@ extension DateTimeExtension on DateTime {
     }
     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;
+  }
+
+  String get show {
+    return toIso8601String().substring(0, 10);
+  }
+}

lib/common/dav_client.dart

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

lib/common/launch.dart

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

lib/common/measure.dart

@@ -23,10 +23,11 @@ class Measure {
   double? _bodyMediumHeight;
   double? _bodySmallHeight;
   double? _labelSmallHeight;
+  double? _labelMediumHeight;
   double? _titleLargeHeight;
+  double? _titleMediumHeight;
 
-
-  double get bodyMediumHeight{
+  double get bodyMediumHeight {
     _bodyMediumHeight ??= computeTextSize(
       Text(
         "",
@@ -36,7 +37,7 @@ class Measure {
     return _bodyMediumHeight!;
   }
 
-  double get bodySmallHeight{
+  double get bodySmallHeight {
     _bodySmallHeight ??= computeTextSize(
       Text(
         "",
@@ -46,7 +47,7 @@ class Measure {
     return _bodySmallHeight!;
   }
 
-  double get labelSmallHeight{
+  double get labelSmallHeight {
     _labelSmallHeight ??= computeTextSize(
       Text(
         "",
@@ -56,7 +57,17 @@ class Measure {
     return _labelSmallHeight!;
   }
 
-  double get titleLargeHeight{
+  double get labelMediumHeight {
+    _labelMediumHeight ??= computeTextSize(
+      Text(
+        "",
+        style: context.textTheme.labelMedium,
+      ),
+    ).height;
+    return _labelMediumHeight!;
+  }
+
+  double get titleLargeHeight {
     _titleLargeHeight ??= computeTextSize(
       Text(
         "",
@@ -65,4 +76,14 @@ class Measure {
     ).height;
     return _titleLargeHeight!;
   }
+
+  double get titleMediumHeight {
+    _titleMediumHeight ??= computeTextSize(
+      Text(
+        "",
+        style: context.textTheme.titleMedium,
+      ),
+    ).height;
+    return _titleMediumHeight!;
+  }
 }

lib/common/navigation.dart

@@ -29,6 +29,14 @@ class Navigation {
         label: "profiles",
         fragment: ProfilesFragment(),
       ),
+      const NavigationItem(
+        icon: Icon(Icons.swap_vert_circle),
+        label: "resources",
+        description: "resourcesDesc",
+        keep: false,
+        fragment: Resources(),
+        modes: [NavigationItemMode.desktop, NavigationItemMode.more],
+      ),
       NavigationItem(
         icon: const Icon(Icons.adb),
         label: "logs",

lib/common/other.dart

@@ -2,6 +2,8 @@ import 'dart:io';
 import 'dart:isolate';
 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:zxing2/qrcode.dart';
 import 'package:image/image.dart' as img;
@@ -147,6 +149,43 @@ class Other {
       }
     });
   }
+
+  String? getFileNameForDisposition(String? disposition) {
+    if (disposition == null) return null;
+    final parseValue = HeaderValue.parse(disposition);
+    final parameters = parseValue.parameters;
+    final key = parameters.keys
+        .firstWhere((key) => key.startsWith("filename"), orElse: () => '');
+    if (key.isEmpty) return null;
+    if (key == "filename*") {
+      return Uri.decodeComponent((parameters[key] ?? "").split("'").last);
+    } else {
+      return parameters[key];
+    }
+  }
+
+  double getViewWidth() {
+    final view = WidgetsBinding.instance.platformDispatcher.views.first;
+    final size = view.physicalSize / view.devicePixelRatio;
+    return size.width;
+  }
+
+  List<String> parseReleaseBody(String? body) {
+    if(body == null) return [];
+    const pattern = r'- (.+?)\. \[.+?\]';
+    final regex = RegExp(pattern);
+    return regex
+        .allMatches(body)
+        .map((match) => match.group(1) ?? '')
+        .where((item) => item.isNotEmpty)
+        .toList();
+  }
+
+  ViewMode getViewMode(double viewWidth){
+    if (viewWidth <= maxMobileWidth) return ViewMode.mobile;
+    if (viewWidth <= maxLaptopWidth) return ViewMode.laptop;
+    return ViewMode.desktop;
+  }
 }
 
 final other = Other();

lib/common/path.dart

@@ -26,14 +26,9 @@ class AppPath {
     return directory.path;
   }
 
-  Future<String> getConfigPath() async {
-    final directory = await applicationSupportDirectoryCompleter.future;
-    return join(directory.path, appConstant.configFileName);
-  }
-
   Future<String> getProfilesPath() async {
     final directory = await applicationSupportDirectoryCompleter.future;
-    return join(directory.path, appConstant.profilesDirectoryName);
+    return join(directory.path, profilesDirectoryName);
   }
 
   Future<String?> getProfilePath(String? id) async {
@@ -41,11 +36,6 @@ class AppPath {
     final directory = await getProfilesPath();
     return join(directory, "$id.yaml");
   }
-
-  Future<String> getMMDBPath() async {
-    var directory = await applicationSupportDirectoryCompleter.future;
-    return join(directory.path, appConstant.mmdbFileName);
-  }
 }
 
 final appPath = AppPath();

lib/common/picker.dart

@@ -3,10 +3,9 @@ import 'dart:io';
 import 'package:file_picker/file_picker.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:fl_clash/models/models.dart';
 
 class Picker {
-  Future<Result<PlatformFile>> pickerConfigFile() async {
+  Future<PlatformFile?> pickerConfigFile() async {
     FilePickerResult? filePickerResult;
     if (Platform.isAndroid) {
       filePickerResult = await FilePicker.platform.pickFiles(
@@ -23,20 +22,20 @@ class Picker {
     }
     final file = filePickerResult?.files.first;
     if (file == null) {
-      return Result.error(message: appLocalizations.pleaseUploadFile);
+      return null;
     }
-    return Result.success(data: file);
+    return file;
   }
 
-  Future<Result<String>> pickerConfigQRCode() async {
+  Future<String?> pickerConfigQRCode() async {
     final xFile = await ImagePicker().pickImage(source: ImageSource.gallery);
     final bytes = await xFile?.readAsBytes();
-    if (bytes == null) return Result.error();
+    if (bytes == null) return null;
     final result = await other.parseQRCode(bytes);
     if (result == null || !result.isUrl) {
-      return Result.error(message: appLocalizations.pleaseUploadValidQrcode);
+      throw appLocalizations.pleaseUploadValidQrcode;
     }
-    return Result.success(data: result);
+    return result;
   }
 }
 

lib/common/preferences.dart

@@ -22,7 +22,7 @@ class Preferences {
 
   Future<ClashConfig?> getClashConfig() async {
     final preferences = await sharedPreferencesCompleter.future;
-    final clashConfigString = preferences.getString(appConstant.clashKey);
+    final clashConfigString = preferences.getString(clashConfigKey);
     if (clashConfigString == null) return null;
     final clashConfigMap = json.decode(clashConfigString);
     try {
@@ -35,14 +35,14 @@ class Preferences {
   Future<bool> saveClashConfig(ClashConfig clashConfig) async {
     final preferences = await sharedPreferencesCompleter.future;
     return preferences.setString(
-      appConstant.clashKey,
+      clashConfigKey,
       json.encode(clashConfig),
     );
   }
 
   Future<Config?> getConfig() async {
     final preferences = await sharedPreferencesCompleter.future;
-    final configString = preferences.getString(appConstant.configKey);
+    final configString = preferences.getString(configKey);
     if (configString == null) return null;
     final configMap = json.decode(configString);
     try {
@@ -55,7 +55,7 @@ class Preferences {
   Future<bool> saveConfig(Config config) async {
     final preferences = await sharedPreferencesCompleter.future;
     return preferences.setString(
-      appConstant.configKey,
+      configKey,
       json.encode(config),
     );
   }

lib/common/proxy.dart

@@ -11,7 +11,7 @@ class ProxyManager {
     _proxy = proxy ?? proxy_plugin.Proxy();
   }
 
-  bool get isStart => startTime != null && startTime!.isBeforeNow();
+  bool get isStart => startTime != null && startTime!.isBeforeNow;
 
   DateTime? get startTime => _proxy.startTime;
 

lib/common/request.dart

@@ -1,36 +1,105 @@
-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:http/http.dart';
-import '../models/models.dart';
+import 'package:fl_clash/models/ip.dart';
+import 'package:fl_clash/state.dart';
 
 class Request {
-  static Future<Result<Response>> getFileResponseForUrl(String url) async {
-    final headers = {'User-Agent': appConstant.name};
-    try {
-      final response = await get(Uri.parse(url), headers: headers).timeout(
-        appConstant.httpTimeoutDuration,
+  late final Dio _dio;
+  int? _port;
+  bool _isStart = false;
+
+  Request() {
+    _dio = Dio(
+      BaseOptions(
+        headers: {"User-Agent": coreName},
+      ),
+    );
+    _dio.interceptors.add(InterceptorsWrapper(
+      onRequest: (options, handler) {
+        _syncProxy();
+        return handler.next(options); // 继续请求
+      },
+    ));
+  }
+
+  _syncProxy() {
+    final port = globalState.appController.clashConfig.mixedPort;
+    final isStart = globalState.appController.appState.isStart;
+    if (_port != port || isStart != _isStart) {
+      _port = port;
+      _isStart = isStart;
+      _dio.httpClientAdapter = IOHttpClientAdapter(
+        createHttpClient: () {
+          final client = HttpClient();
+          if (!_isStart) return client;
+          client.findProxy = (url) {
+            return "PROXY localhost:$_port;DIRECT";
+          };
+          return client;
+        },
       );
-      return Result.success(data: response);
-    } catch (err) {
-      return Result.error(message: err.toString());
     }
   }
 
-  static Future<Result<String>> checkForUpdate() async {
-    final response = await get(
-      Uri.parse(
-        "https://api.github.com/repos/${appConstant.repository}/releases/latest",
+  Future<Response> getFileResponseForUrl(String url) async {
+    final response = await _dio
+        .get(
+          url,
+          options: Options(
+            responseType: ResponseType.bytes,
+          ),
+        )
+        .timeout(
+          httpTimeoutDuration * 2,
+        );
+    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();
-    final body = json.decode(response.body);
-    final remoteVersion = body['tag_name'];
+    if (response.statusCode != 200) return null;
+    final data = response.data as Map<String, dynamic>;
+    final remoteVersion = data['tag_name'];
     final packageInfo = await appPackage.packageInfoCompleter.future;
     final version = packageInfo.version;
     final hasUpdate =
         other.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
-    if (!hasUpdate) return Result.error();
-    return Result.success(data: body['body']);
+    if (!hasUpdate) return null;
+    return data;
+  }
+
+  final Map<String, IpInfo Function(Map<String, dynamic>)> _ipInfoSources = {
+    "https://ipwho.is/": IpInfo.fromIpwhoIsJson,
+    "https://api.ip.sb/geoip/": IpInfo.fromIpSbJson,
+    "https://ipapi.co/json/": IpInfo.fromIpApiCoJson,
+    "https://ipinfo.io/json/": IpInfo.fromIpInfoIoJson,
+  };
+
+  Future<IpInfo?> checkIp(CancelToken? cancelToken) async {
+    for (final source in _ipInfoSources.entries) {
+      try {
+        final response = await _dio
+            .get<Map<String, dynamic>>(source.key, cancelToken: cancelToken)
+            .timeout(
+              httpTimeoutDuration,
+            );
+        if (response.statusCode == 200 && response.data != null) {
+          return source.value(response.data!);
+        }
+      } catch (e) {
+        continue;
+      }
+    }
+    return null;
   }
 }
+
+final request = Request();

lib/common/text.dart

@@ -6,6 +6,11 @@ extension TextStyleExtension on TextStyle {
     return copyWith(color: color?.toLight());
   }
 
+  toLighter() {
+    return copyWith(color: color?.toLighter());
+  }
+
+
   toSoftBold() {
     return copyWith(fontWeight: FontWeight.w500);
   }

lib/controller.dart

@@ -1,11 +1,12 @@
 import 'dart:async';
 
+import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 import 'clash/core.dart';
-import 'enum/enum.dart';
 import 'models/models.dart';
 import 'common/common.dart';
 
@@ -75,10 +76,10 @@ class AppController {
     );
   }
 
-  addProfile(Profile profile) {
+  addProfile(Profile profile) async {
     config.setProfile(profile);
     if (config.currentProfileId != null) return;
-    changeProfile(profile.id);
+    await changeProfile(profile.id);
   }
 
   deleteProfile(String id) async {
@@ -96,43 +97,33 @@ class AppController {
     }
   }
 
-  updateProfile(String id) async {
+  Future<void> updateProfile(String id) async {
     final profile = config.getCurrentProfileForId(id);
     if (profile != null) {
-      final res = await profile.update();
-      if (res.type == ResultType.success) {
-        config.setProfile(profile);
-      }
+      final tempProfile = profile.copyWith();
+      await tempProfile.update();
+      config.setProfile(tempProfile);
     }
   }
 
-  Future<String> updateClashConfig({bool isPatch = true}) async {
-    return await globalState.updateClashConfig(
+  Future<void> updateClashConfig({bool isPatch = true}) async {
+    await globalState.updateClashConfig(
       clashConfig: clashConfig,
       config: config,
       isPatch: isPatch,
     );
   }
 
-  applyProfile() async {
-    await globalState.applyProfile(
-      appState: appState,
-      config: config,
-      clashConfig: clashConfig,
-    );
-  }
-
-  Function? _changeProfileDebounce;
-
-  changeProfileDebounce(String? profileId) {
-    if (profileId == config.currentProfileId) return;
-    config.currentProfileId = profileId;
-    _changeProfileDebounce ??= debounce<Function(String?)>((profileId) async {
-      await applyProfile();
-      appState.delayMap = {};
-      saveConfigPreferences();
+  Future applyProfile() async {
+    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
+    if (commonScaffoldState?.mounted != true) return;
+    commonScaffoldState?.loadingRun(() async {
+      await globalState.applyProfile(
+        appState: appState,
+        config: config,
+        clashConfig: clashConfig,
+      );
     });
-    _changeProfileDebounce!([profileId]);
   }
 
   changeProfile(String? value) async {
@@ -145,14 +136,25 @@ class AppController {
 
   autoUpdateProfiles() async {
     for (final profile in config.profiles) {
-      if (!profile.autoUpdate) return;
+      if (!profile.autoUpdate) continue;
       final isNotNeedUpdate = profile.lastUpdateDate
           ?.add(
             profile.autoUpdateDuration,
           )
-          .isBeforeNow();
-      if (isNotNeedUpdate == false) continue;
-      await profile.update();
+          .isBeforeNow;
+      if (isNotNeedUpdate == false || profile.type == ProfileType.file) {
+        continue;
+      }
+      await updateProfile(profile.id);
+    }
+  }
+
+  updateProfiles() async {
+    for (final profile in config.profiles) {
+      if (profile.type == ProfileType.file) {
+        continue;
+      }
+      await updateProfile(profile.id);
     }
   }
 
@@ -206,6 +208,54 @@ class AppController {
     }
   }
 
+  autoCheckUpdate() async {
+    if (!config.autoCheckUpdate) return;
+    final res = await request.checkForUpdate();
+    checkUpdateResultHandle(data: res);
+  }
+
+  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 {
     if (config.autoRun) {
       await updateSystemProxy(true);
@@ -218,31 +268,18 @@ class AppController {
     if (!config.silentLaunch) {
       window?.show();
     }
-  }
-
-  healthcheck() {
-    for (final delay in appState.delayMap.entries) {
-      setDelay(
-        Delay(
-          name: delay.key,
-          value: 0,
-        ),
-      );
-    }
-    clashCore.healthcheck();
+    autoCheckUpdate();
   }
 
   setDelay(Delay delay) {
     appState.setDelay(delay);
   }
 
-  updateDelayMap() async {
-    appState.delayMap = await clashCore.getDelayMap();
-  }
-
   toPage(int index, {bool hasAnimate = false}) {
-    final nextLabel = globalState.currentNavigationItems[index].label;
-    appState.currentLabel = nextLabel;
+    if (index > appState.currentNavigationItems.length - 1) {
+      return;
+    }
+    appState.currentLabel = appState.currentNavigationItems[index].label;
     if ((config.isAnimateToPage || hasAnimate)) {
       globalState.pageController?.animateToPage(
         index,
@@ -254,12 +291,8 @@ class AppController {
     }
   }
 
-  updatePackages() async {
-    await globalState.updatePackages(appState);
-  }
-
   toProfiles() {
-    final index = globalState.currentNavigationItems.indexWhere(
+    final index = appState.currentNavigationItems.indexWhere(
       (element) => element.label == "profiles",
     );
     if (index != -1) {
@@ -301,78 +334,55 @@ class AppController {
     toProfiles();
     final commonScaffoldState = globalState.homeScaffoldKey.currentState;
     if (commonScaffoldState?.mounted != true) return;
-    commonScaffoldState?.loadingRun(
+    final profile = await commonScaffoldState?.loadingRun<Profile>(
       () async {
-        await Future.delayed(const Duration(milliseconds: 300));
         final profile = Profile(
           url: url,
         );
-        final res = await profile.update();
-        if (res.type == ResultType.success) {
-          addProfile(profile);
-        } else {
-          debugPrint(res.message);
-          globalState.showMessage(
-            title: "${appLocalizations.add}${appLocalizations.profile}",
-            message: TextSpan(text: res.message!),
-          );
-        }
+        await profile.update();
+        return profile;
       },
+      title: "${appLocalizations.add}${appLocalizations.profile}",
     );
+    if (profile != null) {
+      await addProfile(profile);
+    }
   }
 
   addProfileFormFile() async {
-    final result = await picker.pickerConfigFile();
-    if (result.type == ResultType.error) return;
+    final platformFile = await globalState.safeRun(picker.pickerConfigFile);
     if (!context.mounted) return;
     globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
     toProfiles();
     final commonScaffoldState = globalState.homeScaffoldKey.currentState;
     if (commonScaffoldState?.mounted != true) return;
-    commonScaffoldState?.loadingRun(
+    final profile = await commonScaffoldState?.loadingRun<Profile?>(
       () async {
         await Future.delayed(const Duration(milliseconds: 300));
-        final bytes = result.data?.bytes;
+        final bytes = platformFile?.bytes;
         if (bytes == null) {
-          return;
+          return null;
         }
-        final profile = Profile(label: result.data?.name);
-        final sRes = await profile.saveFile(bytes);
-        if (sRes.type == ResultType.error) {
-          debugPrint(sRes.message);
-          globalState.showMessage(
-            title: "${appLocalizations.add}${appLocalizations.profile}",
-            message: TextSpan(text: sRes.message!),
-          );
-          return;
-        }
-        addProfile(profile);
+        final profile = Profile(label: platformFile?.name);
+        await profile.saveFile(bytes);
+        return profile;
       },
+      title: "${appLocalizations.add}${appLocalizations.profile}",
     );
+    if (profile != null) {
+      await addProfile(profile);
+    }
   }
 
   addProfileFormQrCode() async {
-    final result = await picker.pickerConfigQRCode();
-    if (result.type == ResultType.error) {
-      if(result.message != null){
-        globalState.showMessage(
-          title: appLocalizations.tip,
-          message: TextSpan(
-            text: result.message,
-          ),
-        );
-      }
-      return;
-    }
-    addProfileFormURL(result.data!);
+    final url = await globalState.safeRun(picker.pickerConfigQRCode);
+    if (url == null) return;
+    addProfileFormURL(url);
   }
 
-  clearShowProxyDelay() {
-    final showProxyDelay = appState.getRealProxyName(appState.showProxyName);
-    if (showProxyDelay != null) {
-      appState.setDelay(
-        Delay(name: showProxyDelay, value: null),
-      );
-    }
+  updateViewWidth(double width) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      appState.viewWidth = width;
+    });
   }
 }

lib/enum/enum.dart

@@ -1,6 +1,6 @@
 // ignore_for_file: constant_identifier_names
 
-enum GroupType { Selector, URLTest, Fallback }
+enum GroupType { Selector, URLTest, Fallback, LoadBalance, Relay }
 
 enum GroupName { GLOBAL, Proxy, Auto, Fallback }
 
@@ -34,6 +34,8 @@ extension UsedProxyExtension on UsedProxy {
 
 enum Mode { rule, global, direct }
 
+enum ViewMode { mobile, laptop, desktop }
+
 enum LogLevel { debug, info, warning, error, silent }
 
 enum TransportProtocol { udp, tcp }
@@ -55,3 +57,8 @@ enum ProfileType { file, url }
 enum ResultType { success, error }
 
 enum MessageType { log, tun, delay, process, now }
+
+enum RecoveryOption {
+  all,
+  onlyProfiles,
+}

lib/fragments/about.dart

@@ -7,6 +7,20 @@ import 'package:url_launcher/url_launcher.dart';
 class AboutFragment extends StatelessWidget {
   const AboutFragment({super.key});
 
+  _checkUpdate(BuildContext context) async {
+    final commonScaffoldState = context.commonScaffoldState;
+    if (commonScaffoldState?.mounted != true) return;
+    final data =
+        await commonScaffoldState?.loadingRun<Map<String, dynamic>?>(
+      request.checkForUpdate,
+      title: appLocalizations.checkUpdate,
+    );
+    globalState.appController.checkUpdateResultHandle(
+      data: data,
+      handleError: true,
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return ListView(
@@ -32,7 +46,7 @@ class AboutFragment extends StatelessWidget {
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       Text(
-                        appConstant.name,
+                        appName,
                         style: Theme.of(context).textTheme.headlineSmall,
                       ),
                       FutureBuilder<PackageInfo>(
@@ -66,18 +80,7 @@ class AboutFragment extends StatelessWidget {
         ListTile(
           title: Text(appLocalizations.checkUpdate),
           onTap: () {
-            final commonScaffoldState = context.commonScaffoldState;
-            if (commonScaffoldState?.mounted != true) return;
-            commonScaffoldState?.loadingRun(() async {
-              await globalState.checkUpdate(
-                () {
-                  launchUrl(
-                    Uri.parse(
-                        "https://github.com/${appConstant.repository}/releases/latest"),
-                  );
-                },
-              );
-            });
+            _checkUpdate(context);
           },
         ),
         ListTile(
@@ -93,7 +96,7 @@ class AboutFragment extends StatelessWidget {
           title: Text(appLocalizations.project),
           onTap: () {
             launchUrl(
-              Uri.parse("https://github.com/${appConstant.repository}"),
+              Uri.parse("https://github.com/$repository"),
             );
           },
           trailing: const Icon(Icons.launch),

lib/fragments/access.dart

@@ -1,3 +1,4 @@
+import 'package:collection/collection.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/plugins/app.dart';
@@ -7,57 +8,31 @@ import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-class AccessFragment extends StatelessWidget {
+extension AccessControlExtension on AccessControl {
+  List<String> get currentList => switch (mode) {
+        AccessControlMode.acceptSelected => acceptList,
+        AccessControlMode.rejectSelected => rejectList,
+      };
+}
+
+class AccessFragment extends StatefulWidget {
   const AccessFragment({super.key});
 
-  Widget _buildPackageItem({
-    required Package package,
-    required bool value,
-    required bool isActive,
-    required void Function(bool?) onChanged,
-  }) {
-    return AbsorbPointer(
-      absorbing: !isActive,
-      child: ListItem.checkbox(
-        leading: SizedBox(
-          width: 48,
-          height: 48,
-          child: FutureBuilder<ImageProvider?>(
-            future: app?.getPackageIcon(package.packageName),
-            builder: (_, snapshot) {
-              if (!snapshot.hasData && snapshot.data == null) {
-                return Container();
-              } else {
-                return Image(
-                  image: snapshot.data!,
-                  gaplessPlayback: true,
-                  width: 48,
-                  height: 48,
-                );
-              }
-            },
-          ),
-        ),
-        title: Text(
-          package.label,
-          style: const TextStyle(
-            overflow: TextOverflow.ellipsis,
-          ),
-          maxLines: 1,
-        ),
-        subtitle: Text(
-          package.packageName,
-          style: const TextStyle(
-            overflow: TextOverflow.ellipsis,
-          ),
-          maxLines: 1,
-        ),
-        delegate: CheckboxDelegate(
-          value: value,
-          onChanged: onChanged,
-        ),
-      ),
-    );
+  @override
+  State<AccessFragment> createState() => _AccessFragmentState();
+}
+
+class _AccessFragmentState extends State<AccessFragment> {
+  final packagesListenable = ValueNotifier<List<Package>>([]);
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      Future.delayed(const Duration(milliseconds: 300), () async {
+        packagesListenable.value = await app?.getPackages() ?? [];
+      });
+    });
   }
 
   Widget _buildAppProxyModePopup() {
@@ -115,177 +90,244 @@ class AccessFragment extends StatelessWidget {
     );
   }
 
-  Widget _buildSelectedAllButton({
-    required bool isSelectedAll,
-    required List<String> allValueList,
-  }) {
-    return Builder(
-      builder: (context) {
-        final tooltip = isSelectedAll
-            ? appLocalizations.cancelSelectAll
-            : appLocalizations.selectAll;
-        return IconButton(
-          tooltip: tooltip,
-          onPressed: () {
-            final config = context.read<Config>();
-            if (isSelectedAll) {
-              config.accessControl.currentList = [];
-              config.accessControl = config.accessControl.copyWith();
-            } else {
-              config.accessControl.currentList = allValueList;
-              config.accessControl = config.accessControl.copyWith();
-            }
-          },
-          icon: isSelectedAll
-              ? const Icon(Icons.deselect)
-              : const Icon(Icons.select_all),
-        );
+  Widget _buildSearchButton(List<Package> packages) {
+    return IconButton(
+      tooltip: appLocalizations.search,
+      onPressed: () {
+        showSearch(
+          context: context,
+          delegate: AccessControlSearchDelegate(
+            packages: packages,
+          ),
+        ).then((_) => {setState(() {})});
       },
+      icon: const Icon(Icons.search),
     );
   }
 
-  Widget _buildPackageList(bool isAccessControl) {
-    return Selector2<AppState, Config, PackageListSelectorState>(
-      selector: (_, appState, config) => PackageListSelectorState(
-        accessControl: config.accessControl,
-        packages: appState.packages,
-      ),
-      builder: (context, state, __) {
-        final accessControl = state.accessControl;
-        final isFilterSystemApp = accessControl.isFilterSystemApp;
-        final packages = isFilterSystemApp
-            ? state.packages
-                .where((element) => element.isSystem == false)
-                .toList()
-            : state.packages;
-        final packageNameList = packages.map((e) => e.packageName).toList();
-        final accessControlMode = accessControl.mode;
-        final valueList =
-            accessControl.currentList.intersection(packageNameList);
-        final describe = accessControlMode == AccessControlMode.acceptSelected
-            ? appLocalizations.accessControlAllowDesc
-            : appLocalizations.accessControlNotAllowDesc;
+  // Widget _buildSelectedAllButton({
+  //   required bool isSelectedAll,
+  //   required List<String> allValueList,
+  // }) {
+  //   return Builder(
+  //     builder: (context) {
+  //       final tooltip = isSelectedAll
+  //           ? appLocalizations.cancelSelectAll
+  //           : appLocalizations.selectAll;
+  //       return IconButton(
+  //         tooltip: tooltip,
+  //         onPressed: () {
+  //           final config = globalState.appController.config;
+  //           final isAccept =
+  //               config.accessControl.mode == AccessControlMode.acceptSelected;
+  //
+  //           if (isSelectedAll) {
+  //             config.accessControl = switch (isAccept) {
+  //               true => config.accessControl.copyWith(
+  //                   acceptList: [],
+  //                 ),
+  //               false => config.accessControl.copyWith(
+  //                   rejectList: [],
+  //                 ),
+  //             };
+  //           } else {
+  //             config.accessControl = switch (isAccept) {
+  //               true => config.accessControl.copyWith(
+  //                   acceptList: allValueList,
+  //                 ),
+  //               false => config.accessControl.copyWith(
+  //                   rejectList: allValueList,
+  //                 ),
+  //             };
+  //           }
+  //         },
+  //         icon: isSelectedAll
+  //             ? const Icon(Icons.deselect)
+  //             : const Icon(Icons.select_all),
+  //       );
+  //     },
+  //   );
+  // }
 
-        final listView = ListView.builder(
-          itemCount: packages.length,
-          itemBuilder: (_, index) {
-            final package = packages[index];
-            return _buildPackageItem(
-              package: package,
-              value: valueList.contains(package.packageName),
-              isActive: isAccessControl,
-              onChanged: (value) {
-                if (value == true) {
-                  valueList.add(package.packageName);
-                } else {
-                  valueList.remove(package.packageName);
-                }
-                final config = context.read<Config>();
-                config.accessControl.currentList = valueList;
-                config.accessControl = config.accessControl.copyWith();
-              },
-            );
-          },
-        );
-
-        return DisabledMask(
-          status: !isAccessControl,
-          child: Column(
-            children: [
-              AbsorbPointer(
-                absorbing: !isAccessControl,
-                child: Padding(
-                  padding: const EdgeInsets.only(
-                    top: 4,
-                    bottom: 4,
-                    left: 16,
-                    right: 8,
-                  ),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    mainAxisSize: MainAxisSize.max,
-                    children: [
-                      Expanded(
-                        child: IntrinsicHeight(
-                          child: Column(
-                            mainAxisSize: MainAxisSize.max,
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Expanded(
-                                child: Row(
-                                  children: [
-                                    Flexible(
-                                      child: Text(
-                                        appLocalizations.selected,
-                                        style: Theme.of(context)
-                                            .textTheme
-                                            .labelLarge
-                                            ?.copyWith(
-                                              color: Theme.of(context)
-                                                  .colorScheme
-                                                  .primary,
-                                            ),
-                                      ),
-                                    ),
-                                    const Flexible(
-                                      child: SizedBox(
-                                        width: 8,
-                                      ),
-                                    ),
-                                    Flexible(
-                                      child: Text(
-                                        "${valueList.length}",
-                                        style: Theme.of(context)
-                                            .textTheme
-                                            .labelLarge
-                                            ?.copyWith(
-                                              color: Theme.of(context)
-                                                  .colorScheme
-                                                  .primary,
-                                            ),
-                                      ),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                              Flexible(
-                                child: Text(describe),
-                              )
-                            ],
-                          ),
-                        ),
+  Widget _buildPackageList() {
+    return ValueListenableBuilder(
+      valueListenable: packagesListenable,
+      builder: (_, packages, ___) {
+        final accessControl = globalState.appController.config.accessControl;
+        final acceptList = accessControl.acceptList;
+        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 accessControlMode = accessControl.mode;
+            final packages =
+                accessControlMode == AccessControlMode.acceptSelected
+                    ? acceptPackages
+                    : rejectPackages;
+            final currentList = accessControl.currentList;
+            final currentPackages = isFilterSystemApp
+                ? packages
+                    .where((element) => element.isSystem == false)
+                    .toList()
+                : packages;
+            final packageNameList =
+                currentPackages.map((e) => e.packageName).toList();
+            final valueList = currentList.intersection(packageNameList);
+            final describe =
+                accessControlMode == AccessControlMode.acceptSelected
+                    ? appLocalizations.accessControlAllowDesc
+                    : appLocalizations.accessControlNotAllowDesc;
+            return DisabledMask(
+              status: !isAccessControl,
+              child: Column(
+                children: [
+                  AbsorbPointer(
+                    absorbing: !isAccessControl,
+                    child: Padding(
+                      padding: const EdgeInsets.only(
+                        top: 4,
+                        bottom: 4,
+                        left: 16,
+                        right: 8,
                       ),
-                      Row(
-                        mainAxisSize: MainAxisSize.min,
-                        mainAxisAlignment: MainAxisAlignment.end,
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        mainAxisSize: MainAxisSize.max,
                         children: [
-                          Flexible(
-                            child: _buildSelectedAllButton(
-                              isSelectedAll:
-                                  valueList.length == packageNameList.length,
-                              allValueList: packageNameList,
+                          Expanded(
+                            child: IntrinsicHeight(
+                              child: Column(
+                                mainAxisSize: MainAxisSize.max,
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Expanded(
+                                    child: Row(
+                                      children: [
+                                        Flexible(
+                                          child: Text(
+                                            appLocalizations.selected,
+                                            style: Theme.of(context)
+                                                .textTheme
+                                                .labelLarge
+                                                ?.copyWith(
+                                                  color: Theme.of(context)
+                                                      .colorScheme
+                                                      .primary,
+                                                ),
+                                          ),
+                                        ),
+                                        const Flexible(
+                                          child: SizedBox(
+                                            width: 8,
+                                          ),
+                                        ),
+                                        Flexible(
+                                          child: Text(
+                                            "${valueList.length}",
+                                            style: Theme.of(context)
+                                                .textTheme
+                                                .labelLarge
+                                                ?.copyWith(
+                                                  color: Theme.of(context)
+                                                      .colorScheme
+                                                      .primary,
+                                                ),
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ),
+                                  Flexible(
+                                    child: Text(describe),
+                                  )
+                                ],
+                              ),
                             ),
                           ),
-                          Flexible(child: _buildFilterSystemAppButton()),
-                          Flexible(child: _buildAppProxyModePopup()),
+                          Row(
+                            mainAxisSize: MainAxisSize.min,
+                            mainAxisAlignment: MainAxisAlignment.end,
+                            children: [
+                              Flexible(
+                                  child: _buildSearchButton(currentPackages)),
+                              Flexible(child: _buildFilterSystemAppButton()),
+                              Flexible(child: _buildAppProxyModePopup()),
+                            ],
+                          ),
                         ],
                       ),
-                    ],
+                    ),
                   ),
-                ),
+                  Expanded(
+                    flex: 1,
+                    child: FadeBox(
+                      key: const Key("fade_box"),
+                      child: currentPackages.isEmpty
+                          ? const Center(
+                              child: CircularProgressIndicator(),
+                            )
+                          : ListView.builder(
+                              itemCount: currentPackages.length,
+                              itemBuilder: (_, index) {
+                                final package = currentPackages[index];
+                                return PackageListItem(
+                                  key: Key(package.packageName),
+                                  package: package,
+                                  value:
+                                      valueList.contains(package.packageName),
+                                  isActive: isAccessControl,
+                                  onChanged: (value) {
+                                    if (value == true) {
+                                      valueList.add(package.packageName);
+                                    } else {
+                                      valueList.remove(package.packageName);
+                                    }
+                                    final config =
+                                        globalState.appController.config;
+                                    if (accessControlMode ==
+                                        AccessControlMode.acceptSelected) {
+                                      config.accessControl =
+                                          config.accessControl.copyWith(
+                                        acceptList: valueList,
+                                      );
+                                    } else {
+                                      config.accessControl =
+                                          config.accessControl.copyWith(
+                                        rejectList: valueList,
+                                      );
+                                    }
+                                  },
+                                );
+                              },
+                            ),
+                    ),
+                  ),
+                ],
               ),
-              Flexible(
-                flex: 1,
-                child: FadeBox(
-                  child: packages.isEmpty
-                      ? const Center(
-                          child: CircularProgressIndicator(),
-                        )
-                      : listView,
-                ),
-              ),
-            ],
-          ),
+            );
+          },
         );
       },
     );
@@ -293,14 +335,9 @@ class AccessFragment extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if (globalState.appController.appState.packages.isEmpty) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        globalState.appController.updatePackages();
-      });
-    }
     return Selector<Config, bool>(
       selector: (_, config) => config.isAccessControl,
-      builder: (_, isAccessControl, __) {
+      builder: (_, isAccessControl, child) {
         return Column(
           mainAxisSize: MainAxisSize.max,
           children: [
@@ -324,11 +361,181 @@ class AccessFragment extends StatelessWidget {
               ),
             ),
             Flexible(
-              child: _buildPackageList(isAccessControl),
+              child: child!,
             ),
           ],
         );
       },
+      child: _buildPackageList(),
     );
   }
 }
+
+class PackageListItem extends StatelessWidget {
+  final Package package;
+  final bool value;
+  final bool isActive;
+  final void Function(bool?) onChanged;
+
+  const PackageListItem({
+    super.key,
+    required this.package,
+    required this.value,
+    required this.isActive,
+    required this.onChanged,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return AbsorbPointer(
+      absorbing: !isActive,
+      child: ListItem.checkbox(
+        leading: SizedBox(
+          width: 48,
+          height: 48,
+          child: FutureBuilder<ImageProvider?>(
+            future: app?.getPackageIcon(package.packageName),
+            builder: (_, snapshot) {
+              if (!snapshot.hasData && snapshot.data == null) {
+                return Container();
+              } else {
+                return Image(
+                  image: snapshot.data!,
+                  gaplessPlayback: true,
+                  width: 48,
+                  height: 48,
+                );
+              }
+            },
+          ),
+        ),
+        title: Text(
+          package.label,
+          style: const TextStyle(
+            overflow: TextOverflow.ellipsis,
+          ),
+          maxLines: 1,
+        ),
+        subtitle: Text(
+          package.packageName,
+          style: const TextStyle(
+            overflow: TextOverflow.ellipsis,
+          ),
+          maxLines: 1,
+        ),
+        delegate: CheckboxDelegate(
+          value: value,
+          onChanged: onChanged,
+        ),
+      ),
+    );
+  }
+}
+
+class AccessControlSearchDelegate extends SearchDelegate {
+  final List<Package> packages;
+
+  AccessControlSearchDelegate({
+    required this.packages,
+  });
+
+  List<Package> get _results {
+    final lowQuery = query.toLowerCase();
+    return packages
+        .where(
+          (package) =>
+              package.label.toLowerCase().contains(lowQuery) ||
+              package.packageName.contains(lowQuery),
+        )
+        .toList();
+  }
+
+  @override
+  List<Widget>? buildActions(BuildContext context) {
+    return [
+      IconButton(
+        onPressed: () {
+          if (query.isEmpty) {
+            close(context, null);
+            return;
+          }
+          query = '';
+        },
+        icon: const Icon(Icons.clear),
+      ),
+      const SizedBox(
+        width: 8,
+      )
+    ];
+  }
+
+  @override
+  Widget? buildLeading(BuildContext context) {
+    return IconButton(
+      onPressed: () {
+        close(context, null);
+      },
+      icon: const Icon(Icons.arrow_back),
+    );
+  }
+
+  Widget _packageList(List<Package> packages) {
+    return Selector<Config, PackageListSelectorState>(
+      selector: (_, config) => PackageListSelectorState(
+        accessControl: config.accessControl,
+        isAccessControl: config.isAccessControl,
+      ),
+      builder: (context, state, __) {
+        final accessControl = state.accessControl;
+        final isAccessControl = state.isAccessControl;
+        final accessControlMode = accessControl.mode;
+        final currentList = accessControl.currentList;
+        final packageNameList = this.packages.map((e) => e.packageName).toList();
+        final valueList = currentList.intersection(packageNameList);
+        return DisabledMask(
+          status: !isAccessControl,
+          child: ListView.builder(
+            itemCount: packages.length,
+            itemBuilder: (_, index) {
+              final package = packages[index];
+              return PackageListItem(
+                key: Key(package.packageName),
+                package: package,
+                value: valueList.contains(package.packageName),
+                isActive: isAccessControl,
+                onChanged: (value) {
+                  if (value == true) {
+                    valueList.add(package.packageName);
+                  } else {
+                    valueList.remove(package.packageName);
+                  }
+                  final config = globalState.appController.config;
+                  if (accessControlMode == AccessControlMode.acceptSelected) {
+                    config.accessControl = config.accessControl.copyWith(
+                      acceptList: valueList,
+                    );
+                  } else {
+                    config.accessControl = config.accessControl.copyWith(
+                      rejectList: valueList,
+                    );
+                  }
+                },
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+
+  @override
+  Widget buildResults(BuildContext context) {
+    return _packageList(packages);
+  }
+
+  @override
+  Widget buildSuggestions(BuildContext context) {
+    final packages = _results;
+    return _packageList(packages);
+  }
+}

lib/fragments/application_setting.dart

@@ -36,26 +36,6 @@ class ApplicationSettingFragment extends StatelessWidget {
           );
         },
       ),
-      Selector<Config, bool>(
-        selector: (_, config) => config.isCompatible,
-        builder: (_, isCompatible, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.expand),
-            title:  Text(appLocalizations.compatible),
-            subtitle: Text(appLocalizations.compatibleDesc),
-            delegate: SwitchDelegate(
-              value: isCompatible,
-              onChanged: (bool value) async {
-                final appController = globalState.appController;
-                appController.config.isCompatible = value;
-                await appController.updateClashConfig(isPatch: false);
-                await appController.updateGroups();
-                appController.changeProxy();
-              },
-            ),
-          );
-        },
-      ),
       if (system.isDesktop)
         Selector<Config, bool>(
           selector: (_, config) => config.autoLaunch,
@@ -109,24 +89,6 @@ class ApplicationSettingFragment extends StatelessWidget {
           );
         },
       ),
-      Selector<Config, bool>(
-        selector: (_, config) => config.openLogs,
-        builder: (_, openLogs, child) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.bug_report),
-            title: Text(appLocalizations.logcat),
-            subtitle: Text(appLocalizations.logcatDesc),
-            delegate: SwitchDelegate(
-              value: openLogs,
-              onChanged: (bool value) {
-                final config = context.read<Config>();
-                config.openLogs = value;
-                globalState.appController.updateLogStatus();
-              },
-            ),
-          );
-        },
-      ),
       if (Platform.isAndroid)
         Selector<Config, bool>(
           selector: (_, config) => config.isAnimateToPage,
@@ -145,6 +107,41 @@ class ApplicationSettingFragment extends StatelessWidget {
             );
           },
         ),
+      Selector<Config, bool>(
+        selector: (_, config) => config.openLogs,
+        builder: (_, openLogs, child) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.bug_report),
+            title: Text(appLocalizations.logcat),
+            subtitle: Text(appLocalizations.logcatDesc),
+            delegate: SwitchDelegate(
+              value: openLogs,
+              onChanged: (bool value) {
+                final config = context.read<Config>();
+                config.openLogs = value;
+                globalState.appController.updateLogStatus();
+              },
+            ),
+          );
+        },
+      ),
+      Selector<Config, bool>(
+        selector: (_, config) => config.autoCheckUpdate,
+        builder: (_, autoCheckUpdate, child) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.system_update),
+            title: Text(appLocalizations.autoCheckUpdate),
+            subtitle: Text(appLocalizations.autoCheckUpdateDesc),
+            delegate: SwitchDelegate(
+              value: autoCheckUpdate,
+              onChanged: (bool value) {
+                final config = context.read<Config>();
+                config.autoCheckUpdate = value;
+              },
+            ),
+          );
+        },
+      ),
     ];
     return ListView.separated(
       itemBuilder: (_, index) {

lib/fragments/backup_and_recovery.dart

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

lib/fragments/config.dart

@@ -47,6 +47,27 @@ class _ConfigFragmentState extends State<ConfigFragment> {
   @override
   Widget build(BuildContext context) {
     List<Widget> items = [
+      Selector<ClashConfig, int>(
+        selector: (_, clashConfig) => clashConfig.mixedPort,
+        builder: (_, mixedPort, __) {
+          return ListItem(
+            onTab: () {
+              _modifyMixedPort(mixedPort);
+            },
+            padding: const EdgeInsets.symmetric(horizontal: 16,vertical: 4),
+            leading: const Icon(Icons.adjust),
+            title: Text(appLocalizations.proxyPort),
+            trailing: FilledButton.tonal(
+              onPressed: () {
+                _modifyMixedPort(mixedPort);
+              },
+              child: Text(
+                "$mixedPort",
+              ),
+            ),
+          );
+        },
+      ),
       Selector<ClashConfig, bool>(
         selector: (_, clashConfig) => clashConfig.allowLan,
         builder: (_, allowLan, __) {
@@ -65,81 +86,83 @@ class _ConfigFragmentState extends State<ConfigFragment> {
           );
         },
       ),
-      if (system.isDesktop)
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) => clashConfig.tun.enable,
-          builder: (_, tunEnable, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.support),
-              title: Text(appLocalizations.tun),
-              subtitle: Text(appLocalizations.tunDesc),
-              delegate: SwitchDelegate(
-                value: tunEnable,
-                onChanged: (bool value) async {
-                  final clashConfig = context.read<ClashConfig>();
-                  clashConfig.tun = Tun(enable: value);
-                  globalState.appController.updateClashConfigDebounce();
-                },
-              ),
-            );
-          },
-        ),
-      Selector<ClashConfig, int>(
-        selector: (_, clashConfig) => clashConfig.mixedPort,
-        builder: (_, mixedPort, __) {
-          return ListItem(
-            onTab: () {
-              _modifyMixedPort(mixedPort);
-            },
-            leading: const Icon(Icons.adjust),
-            title: Text(appLocalizations.proxyPort),
-            trailing: FilledButton.tonal(
-              onPressed: () {
-                _modifyMixedPort(mixedPort);
+      // if (system.isDesktop)
+      //   Selector<ClashConfig, bool>(
+      //     selector: (_, clashConfig) => clashConfig.tun.enable,
+      //     builder: (_, tunEnable, __) {
+      //       return ListItem.switchItem(
+      //         leading: const Icon(Icons.support),
+      //         title: Text(appLocalizations.tun),
+      //         subtitle: Text(appLocalizations.tunDesc),
+      //         delegate: SwitchDelegate(
+      //           value: tunEnable,
+      //           onChanged: (bool value) async {
+      //             final clashConfig = context.read<ClashConfig>();
+      //             clashConfig.tun = Tun(enable: value);
+      //             globalState.appController.updateClashConfigDebounce();
+      //           },
+      //         ),
+      //       );
+      //     },
+      //   ),
+      Selector<Config, bool>(
+        selector: (_, config) => config.isCompatible,
+        builder: (_, isCompatible, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.expand),
+            title: Text(appLocalizations.compatible),
+            subtitle: Text(appLocalizations.compatibleDesc),
+            delegate: SwitchDelegate(
+              value: isCompatible,
+              onChanged: (bool value) async {
+                final appController = globalState.appController;
+                appController.config.isCompatible = value;
+                await appController.updateClashConfig(isPatch: false);
+                await appController.updateGroups();
+                appController.changeProxy();
               },
-              child: Text(
-                "$mixedPort",
-              ),
             ),
           );
         },
       ),
-      Selector<ClashConfig, LogLevel>(
-        selector: (_, clashConfig) => clashConfig.logLevel,
-        builder: (_, value, __) {
-          return ListItem(
-            leading: const Icon(Icons.feedback),
-            title: Text(appLocalizations.logLevel),
-            trailing: SizedBox(
-              height: 48,
-              child: DropdownMenu<LogLevel>(
-                width: 124,
-                inputDecorationTheme: const InputDecorationTheme(
-                  filled: true,
-                  contentPadding: EdgeInsets.symmetric(
-                    vertical: 5,
-                    horizontal: 16,
+      Padding(
+        padding: kMaterialListPadding,
+        child: Selector<ClashConfig, LogLevel>(
+          selector: (_, clashConfig) => clashConfig.logLevel,
+          builder: (_, value, __) {
+            return ListItem(
+              leading: const Icon(Icons.feedback),
+              title: Text(appLocalizations.logLevel),
+              trailing: SizedBox(
+                height: 48,
+                child: DropdownMenu<LogLevel>(
+                  width: 124,
+                  inputDecorationTheme: const InputDecorationTheme(
+                    filled: true,
+                    contentPadding: EdgeInsets.symmetric(
+                      vertical: 5,
+                      horizontal: 16,
+                    ),
                   ),
+                  initialSelection: value,
+                  dropdownMenuEntries: [
+                    for (final logLevel in LogLevel.values)
+                      DropdownMenuEntry<LogLevel>(
+                        value: logLevel,
+                        label: logLevel.name,
+                      )
+                  ],
+                  onSelected: _updateLoglevel,
                 ),
-                initialSelection: value,
-                dropdownMenuEntries: [
-                  for (final logLevel in LogLevel.values)
-                    DropdownMenuEntry<LogLevel>(
-                      value: logLevel,
-                      label: logLevel.name,
-                    )
-                ],
-                onSelected: _updateLoglevel,
               ),
-            ),
-          );
-        },
+            );
+          },
+        ),
       ),
     ];
     return ListView.separated(
       itemBuilder: (_, index) {
         return Container(
-          padding: kMaterialListPadding,
           alignment: Alignment.center,
           child: items[index],
         );

lib/fragments/dashboard/dashboard.dart

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

lib/fragments/dashboard/network_detection.dart

@@ -1,3 +1,5 @@
+import 'package:country_flags/country_flags.dart';
+import 'package:dio/dio.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
@@ -13,106 +15,44 @@ class NetworkDetection extends StatefulWidget {
 }
 
 class _NetworkDetectionState extends State<NetworkDetection> {
-  Widget _buildDescription(String? currentProxyName, int? delay) {
-    if (currentProxyName == null) {
-      return TooltipText(
-        text: Text(
-          appLocalizations.noProxyDesc,
-          style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                color: Theme.of(context).colorScheme.secondary,
-              ),
-          overflow: TextOverflow.ellipsis,
-        ),
-      );
-    }
-    if (delay == 0 || delay == null) {
-      return const AspectRatio(
-        aspectRatio: 1,
-        child: CircularProgressIndicator(
-          strokeCap: StrokeCap.round,
-        ),
-      );
-    }
-    if (delay > 0) {
-      return Row(
-        mainAxisAlignment: MainAxisAlignment.start,
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-          TooltipText(
-            text: Text(
-              "$delay",
-              overflow: TextOverflow.ellipsis,
-              maxLines: 1,
-              style: context.textTheme.titleLarge
-                  ?.copyWith(
-                    color: context.colorScheme.primary,
-                  )
-                  .toSoftBold(),
-            ),
-          ),
-          const Flexible(
-            child: SizedBox(
-              width: 4,
-            ),
-          ),
-          Flexible(
-            flex: 0,
-            child: Text(
-              'ms',
-              style: Theme.of(context).textTheme.bodyMedium?.toLight(),
-            ),
-          ),
-        ],
-      );
-    }
-    return Text(
-      "Timeout",
-      style: Theme.of(context).textTheme.titleMedium?.copyWith(
-            color: Colors.red,
-          ),
-    );
-  }
+  final ipInfoNotifier = ValueNotifier<IpInfo?>(null);
+  final timeoutNotifier = ValueNotifier<bool>(false);
+  bool? _preIsStart;
+  CancelToken? cancelToken;
 
-  _updateCurrentDelay(
-    String? currentProxyName,
-    int? delay,
-    bool isCurrent,
+  _checkIp(
     bool isInit,
-  ) {
-    if (!isCurrent || currentProxyName == null || !isInit) return;
-    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-      if (delay == null) {
-        globalState.appController.setDelay(
-          Delay(
-            name: currentProxyName,
-            value: 0,
-          ),
-        );
-        globalState.updateCurrentDelay(
-          currentProxyName,
-        );
-      }
-    });
+    bool isStart,
+  ) async {
+    if (!isInit) return;
+    if (_preIsStart == false && _preIsStart == isStart) return;
+    if (cancelToken != null) {
+      cancelToken!.cancel();
+      cancelToken = null;
+    }
+    ipInfoNotifier.value = null;
+    final ipInfo = await request.checkIp(cancelToken);
+    if (ipInfo == null) {
+      timeoutNotifier.value = true;
+      return;
+    } else {
+      timeoutNotifier.value = false;
+    }
+    _preIsStart = isStart;
+    ipInfoNotifier.value = ipInfo;
   }
 
-  _updateCurrentDelayContainer(Widget child) {
-    return Selector2<AppState, Config, UpdateCurrentDelaySelectorState>(
+  _checkIpContainer(Widget child) {
+    return Selector2<AppState, Config, CheckIpSelectorState>(
       selector: (_, appState, config) {
-        return UpdateCurrentDelaySelectorState(
+        return CheckIpSelectorState(
           isInit: appState.isInit,
-          currentProxyName: appState.getRealProxyName(appState.showProxyName),
-          delay: appState
-              .delayMap[appState.getRealProxyName(appState.showProxyName)],
-          isCurrent: appState.currentLabel == 'dashboard',
+          selectedMap: appState.selectedMap,
+          isStart: appState.isStart,
         );
       },
       builder: (_, state, __) {
-        _updateCurrentDelay(
-          state.currentProxyName,
-          state.delay,
-          state.isCurrent,
-          state.isInit,
-        );
+        _checkIp(state.isInit, state.isStart);
         return child;
       },
       child: child,
@@ -121,62 +61,118 @@ class _NetworkDetectionState extends State<NetworkDetection> {
 
   @override
   Widget build(BuildContext context) {
-    return CommonCard(
-      info: Info(
-        iconData: Icons.network_check,
-        label: appLocalizations.networkDetection,
-      ),
-      child: _updateCurrentDelayContainer(
-        Selector<AppState, NetworkDetectionSelectorState>(
-          selector: (_, appState) {
-            return NetworkDetectionSelectorState(
-              currentProxyName: appState.showProxyName,
-              delay: appState.getDelay(
-                appState.showProxyName,
-              ),
-            );
-          },
-          builder: (_, state, __) {
-            return Container(
-              padding: const EdgeInsets.all(16).copyWith(top: 0),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Flexible(
-                    flex: 0,
-                    child: TooltipText(
-                      text: Text(
-                        state.currentProxyName ?? appLocalizations.noProxy,
-                        overflow: TextOverflow.ellipsis,
-                        maxLines: 1,
-                        style: Theme.of(context)
-                            .textTheme
-                            .titleMedium
-                            ?.toSoftBold(),
-                      ),
-                    ),
-                  ),
-                  const SizedBox(
-                    height: 8,
-                  ),
-                  Flexible(
-                    child: Container(
-                      height: globalState.appController.measure.titleLargeHeight,
-                      alignment: Alignment.centerLeft,
-                      child: FadeBox(
-                        child: _buildDescription(
-                          state.currentProxyName,
-                          state.delay,
+    return _checkIpContainer(
+      ValueListenableBuilder<IpInfo?>(
+        valueListenable: ipInfoNotifier,
+        builder: (_, ipInfo, __) {
+          return CommonCard(
+            child: Column(
+              children: [
+                Flexible(
+                  flex: 0,
+                  child: Container(
+                    padding: const EdgeInsets.all(16),
+                    child: Row(
+                      children: [
+                        Icon(
+                          Icons.network_check,
+                          color: Theme.of(context).colorScheme.primary,
                         ),
-                      ),
+                        const SizedBox(
+                          width: 8,
+                        ),
+                        Flexible(
+                          flex: 1,
+                          child: FadeBox(
+                            child: ipInfo != null
+                                ? CountryFlag.fromCountryCode(
+                                    ipInfo.countryCode,
+                                    width: 24,
+                                    height: 24,
+                                  )
+                                : ValueListenableBuilder(
+                                    valueListenable: timeoutNotifier,
+                                    builder: (_, timeout, __) {
+                                      if (timeout) {
+                                        return Text(
+                                          appLocalizations.checkError,
+                                          style: Theme.of(context)
+                                              .textTheme
+                                              .titleMedium,
+                                          maxLines: 1,
+                                          overflow: TextOverflow.ellipsis,
+                                        );
+                                      }
+                                      return TooltipText(
+                                        text: Text(
+                                          appLocalizations.checking,
+                                          maxLines: 1,
+                                          overflow: TextOverflow.ellipsis,
+                                          style: Theme.of(context)
+                                              .textTheme
+                                              .titleMedium,
+                                        ),
+                                      );
+                                    },
+                                  ),
+                          ),
+                        ),
+                      ],
                     ),
                   ),
-                ],
-              ),
-            );
-          },
-        ),
+                ),
+                Container(
+                  height:
+                      globalState.appController.measure.titleLargeHeight + 24,
+                  alignment: Alignment.centerLeft,
+                  padding: const EdgeInsets.all(16).copyWith(top: 0),
+                  child: FadeBox(
+                    child: ipInfo != null
+                        ? Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              Flexible(
+                                flex: 1,
+                                child: TooltipText(
+                                  text: Text(
+                                    ipInfo.ip,
+                                    style: context.textTheme.titleLarge
+                                        ?.toSoftBold(),
+                                    maxLines: 1,
+                                    overflow: TextOverflow.ellipsis,
+                                  ),
+                                ),
+                              ),
+                            ],
+                          )
+                        : ValueListenableBuilder(
+                            valueListenable: timeoutNotifier,
+                            builder: (_, timeout, __) {
+                              if (timeout) {
+                                return Text(
+                                  appLocalizations.ipCheckTimeout,
+                                  style: context.textTheme.titleLarge
+                                      ?.toSoftBold(),
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis,
+                                );
+                              }
+                              return Container(
+                                padding: const EdgeInsets.all(2),
+                                child: const AspectRatio(
+                                  aspectRatio: 1,
+                                  child: CircularProgressIndicator(),
+                                ),
+                              );
+                            },
+                          ),
+                  ),
+                )
+              ],
+            ),
+          );
+        },
       ),
     );
   }

lib/fragments/dashboard/start_button.dart

@@ -19,7 +19,7 @@ class _StartButtonState extends State<StartButton>
 
   @override
   void initState() {
-    isStart = context.read<AppState>().runTime != null;
+    isStart = globalState.appController.appState.isStart;
     _controller = AnimationController(
       vsync: this,
       value: isStart ? 1 : 0,
@@ -48,12 +48,11 @@ class _StartButtonState extends State<StartButton>
     }
   }
 
-  updateSystemProxy() async {
-    final appController = globalState.appController;
-    await appController.updateSystemProxy(isStart);
-    if (isStart && mounted) {
-      appController.clearShowProxyDelay();
-    }
+  updateSystemProxy() {
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      final appController = globalState.appController;
+      await appController.updateSystemProxy(isStart);
+    });
   }
 
   @override

lib/fragments/fragments.dart

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

lib/fragments/logs.dart

@@ -1,6 +1,8 @@
 import 'dart:async';
 
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../models/models.dart';
@@ -26,10 +28,8 @@ class _LogsFragmentState extends State<LogsFragment> {
         timer?.cancel();
         timer = null;
       }
-      timer = Timer.periodic(const Duration(seconds: 3), (timer) {
-        if (mounted) {
-          logsNotifier.value = context.read<AppState>().logs;
-        }
+      timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
+        logsNotifier.value = globalState.appController.appState.logs;
       });
     });
   }
@@ -56,6 +56,9 @@ class _LogsFragmentState extends State<LogsFragment> {
             );
           },
           icon: const Icon(Icons.search),
+        ),
+        const SizedBox(
+          width: 8,
         )
       ];
     });
@@ -95,7 +98,8 @@ class _LogsFragmentState extends State<LogsFragment> {
     return Selector<AppState, bool?>(
       selector: (_, appState) =>
           appState.currentLabel == 'logs' ||
-          context.isMobile && appState.currentLabel == "tools",
+          appState.viewMode == ViewMode.mobile &&
+              appState.currentLabel == "tools",
       builder: (_, isCurrent, child) {
         if (isCurrent == null || isCurrent) {
           _initActions();
@@ -114,13 +118,16 @@ class LogsSearchDelegate extends SearchDelegate {
     required this.logs,
   });
 
-  List<Log> get _results => logs
-      .where(
-        (log) =>
-            (log.payload?.contains(query) ?? false) ||
-            log.logLevel.name.contains(query),
-      )
-      .toList();
+  List<Log> get _results {
+    final lowQuery = query.toLowerCase();
+    return logs
+        .where(
+          (log) =>
+              (log.payload?.toLowerCase().contains(lowQuery) ?? false) ||
+              log.logLevel.name.contains(lowQuery),
+        )
+        .toList();
+  }
 
   @override
   List<Widget>? buildActions(BuildContext context) {
@@ -135,6 +142,9 @@ class LogsSearchDelegate extends SearchDelegate {
         },
         icon: const Icon(Icons.clear),
       ),
+      const SizedBox(
+        width: 8,
+      )
     ];
   }
 
@@ -161,6 +171,7 @@ class LogsSearchDelegate extends SearchDelegate {
       itemBuilder: (BuildContext context, int index) {
         final log = _results[index];
         return LogItem(
+          key: ValueKey(log.dateTime),
           log: log,
         );
       },

lib/fragments/profiles/edit_profile.dart

@@ -1,4 +1,5 @@
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
@@ -40,7 +41,7 @@ class _EditProfileState extends State<EditProfile> {
   _handleConfirm() {
     if (!_formKey.currentState!.validate()) return;
     final config = widget.context.read<Config>();
-    final hasUpdate = widget.profile.url != urlController.text;
+    final hasUpdate = urlController.text.isNotEmpty && widget.profile.url != urlController.text;
     widget.profile.url = urlController.text;
     widget.profile.label = labelController.text;
     widget.profile.autoUpdate = autoUpdate;
@@ -82,10 +83,11 @@ class _EditProfileState extends State<EditProfile> {
           },
         ),
       ),
-      if (widget.profile.url != null)...[
+      if (widget.profile.type == ProfileType.url)...[
         ListItem(
           title: TextFormField(
             controller: urlController,
+            minLines: 1,
             maxLines: 2,
             decoration: InputDecoration(
               border: const OutlineInputBorder(),

lib/fragments/profiles/profiles.dart

@@ -1,10 +1,10 @@
+import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/fragments/profiles/edit_profile.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
 import 'package:provider/provider.dart';
 
 import 'add_profile.dart';
@@ -25,153 +25,7 @@ class ProfilesFragment extends StatefulWidget {
 }
 
 class _ProfilesFragmentState extends State<ProfilesFragment> {
-  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;
-  }
-
-  _handleDeleteProfile(String id) async {
-    globalState.appController.deleteProfile(id);
-  }
-
-  _handleUpdateProfile(String id) async {
-    context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
-          () => globalState.appController.updateProfile(id),
-        );
-  }
-
-  Widget _profileItem({
-    required Profile profile,
-    required String? groupValue,
-    required void Function(String? value) onChanged,
-  }) {
-    String useShow;
-    String totalShow;
-    double progress;
-    final userInfo = profile.userInfo;
-    if (userInfo == null) {
-      useShow = "Infinite";
-      totalShow = "Infinite";
-      progress = 1;
-    } else {
-      final use = userInfo.upload + userInfo.download;
-      final total = userInfo.total;
-      useShow = TrafficValue(value: use).show;
-      totalShow = TrafficValue(value: total).show;
-      progress = total == 0 ? 0.0 : use / total;
-    }
-    return ListItem.radio(
-      horizontalTitleGap: 16,
-      delegate: RadioDelegate<String?>(
-        value: profile.id,
-        groupValue: groupValue,
-        onChanged: onChanged,
-      ),
-      padding: const EdgeInsets.symmetric(horizontal: 16),
-      trailing: CommonPopupMenu<ProfileActions>(
-        items: [
-          CommonPopupMenuItem(
-            action: ProfileActions.edit,
-            label: appLocalizations.edit,
-            iconData: Icons.edit,
-          ),
-          if (profile.url != null)
-            CommonPopupMenuItem(
-              action: ProfileActions.update,
-              label: appLocalizations.update,
-              iconData: Icons.sync,
-            ),
-          CommonPopupMenuItem(
-            action: ProfileActions.delete,
-            label: appLocalizations.delete,
-            iconData: Icons.delete,
-          ),
-        ],
-        onSelected: (ProfileActions? action) async {
-          switch (action) {
-            case ProfileActions.edit:
-              _handleShowEditExtendPage(profile);
-              break;
-            case ProfileActions.delete:
-              _handleDeleteProfile(profile.id);
-              break;
-            case ProfileActions.update:
-              _handleUpdateProfile(profile.id);
-              break;
-            case null:
-              break;
-          }
-        },
-      ),
-      title: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          Flexible(
-            child: Row(
-              mainAxisSize: MainAxisSize.max,
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Flexible(
-                  child: Text(
-                    profile.label ?? profile.id,
-                    style: Theme.of(context).textTheme.titleMedium,
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis,
-                  ),
-                ),
-                Flexible(
-                  child: Text(
-                    profile.lastUpdateDate != null
-                        ? _getLastUpdateTimeDifference(profile.lastUpdateDate!)
-                        : '',
-                    style: Theme.of(context).textTheme.labelMedium?.toLight(),
-                  ),
-                ),
-              ],
-            ),
-          ),
-          Flexible(
-            child: Container(
-              margin: const EdgeInsets.symmetric(
-                vertical: 8,
-              ),
-              child: LinearProgressIndicator(
-                minHeight: 6,
-                value: progress,
-              ),
-            ),
-          ),
-          Flexible(
-            child: Text(
-              "$useShow / $totalShow",
-              style: Theme.of(context).textTheme.labelMedium?.toLight(),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
+  final hasPadding = ValueNotifier<bool>(false);
 
   _handleShowAddExtendPage() {
     showExtendPage(
@@ -183,7 +37,157 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
     );
   }
 
-  _handleShowEditExtendPage(Profile profile) {
+  _getColumns(ViewMode viewMode) {
+    switch (viewMode) {
+      case ViewMode.mobile:
+        return 1;
+      case ViewMode.laptop:
+        return 1;
+      case ViewMode.desktop:
+        return 2;
+    }
+  }
+
+  _initScaffoldState() {
+    WidgetsBinding.instance.addPostFrameCallback(
+      (_) {
+        final commonScaffoldState =
+            context.findAncestorStateOfType<CommonScaffoldState>();
+        commonScaffoldState?.actions = [
+          IconButton(
+            onPressed: () {
+              commonScaffoldState.loadingRun<void>(
+                () async {
+                  await globalState.appController.updateProfiles();
+                },
+              );
+            },
+            icon: const Icon(Icons.download),
+          ),
+          const SizedBox(
+            width: 8,
+          )
+        ];
+        commonScaffoldState?.floatingActionButton = FloatingActionButton(
+          heroTag: null,
+          onPressed: _handleShowAddExtendPage,
+          child: const Icon(
+            Icons.add,
+          ),
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<AppState, bool>(
+      selector: (_, appState) => appState.currentLabel == 'profiles',
+      builder: (_, isCurrent, child) {
+        if (isCurrent) {
+          _initScaffoldState();
+        }
+        return child!;
+      },
+      child: Selector2<AppState, Config, ProfilesSelectorState>(
+        selector: (_, appState, config) => ProfilesSelectorState(
+          profiles: config.profiles,
+          currentProfileId: config.currentProfileId,
+          viewMode: appState.viewMode,
+        ),
+        builder: (context, state, child) {
+          if (state.profiles.isEmpty) {
+            return NullStatus(
+              label: appLocalizations.nullProfileDesc,
+            );
+          }
+          final columns = _getColumns(state.viewMode);
+          final isMobile = state.viewMode == ViewMode.mobile;
+          return Align(
+            alignment: Alignment.topCenter,
+            child: NotificationListener<ScrollNotification>(
+              onNotification: (scrollNotification) {
+                WidgetsBinding.instance.addPostFrameCallback((_) {
+                  hasPadding.value =
+                      scrollNotification.metrics.maxScrollExtent > 0;
+                });
+                return true;
+              },
+              child: ValueListenableBuilder(
+                valueListenable: hasPadding,
+                builder: (_, hasPadding, __) {
+                  return SingleChildScrollView(
+                    padding: !isMobile
+                        ? EdgeInsets.only(
+                            left: 16,
+                            right: 16,
+                            top: 16,
+                            bottom: 16 + (hasPadding ? 56 : 0),
+                          )
+                        : EdgeInsets.only(
+                            bottom: 0 + (hasPadding ? 56 : 0),
+                          ),
+                    child: Grid(
+                      mainAxisSpacing: isMobile ? 8 : 16,
+                      crossAxisSpacing: 16,
+                      crossAxisCount: columns,
+                      children: [
+                        for (final profile in state.profiles)
+                          GridItem(
+                            child: ProfileItem(
+                              profile: profile,
+                              groupValue: state.currentProfileId,
+                              onChanged:
+                                  globalState.appController.changeProfile,
+                            ),
+                          ),
+                      ],
+                    ),
+                  );
+                },
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
+
+class ProfileItem extends StatefulWidget {
+  final Profile profile;
+  final String? groupValue;
+  final void Function(String? value) onChanged;
+
+  const ProfileItem({
+    super.key,
+    required this.profile,
+    required this.groupValue,
+    required this.onChanged,
+  });
+
+  @override
+  State<ProfileItem> createState() => _ProfileItemState();
+}
+
+class _ProfileItemState extends State<ProfileItem> {
+  final isUpdating = ValueNotifier<bool>(false);
+
+  _handleDeleteProfile(String id) async {
+    globalState.appController.deleteProfile(id);
+  }
+
+  _handleUpdateProfile(String id) async {
+    isUpdating.value = true;
+    await globalState.safeRun<void>(() async {
+      await globalState.appController.updateProfile(id);
+    });
+    isUpdating.value = false;
+  }
+
+  _handleShowEditExtendPage(
+    Profile profile,
+  ) {
     showExtendPage(
       context,
       body: EditProfile(
@@ -194,25 +198,77 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
     );
   }
 
-  _buildGrid({
-    required ProfilesSelectorState state,
-    int crossAxisCount = 1,
-  }) {
-    return SingleChildScrollView(
-      padding: crossAxisCount > 1
-          ? const EdgeInsets.symmetric(horizontal: 16)
-          : EdgeInsets.zero,
-      child: Grid.baseGap(
-        crossAxisCount: crossAxisCount,
+  _buildTitle(Profile profile) {
+    final textTheme = context.textTheme;
+    final userInfo = profile.userInfo ?? UserInfo();
+    final use = userInfo.upload + userInfo.download;
+    final total = userInfo.total;
+    final useShow = TrafficValue(value: use).show;
+    final totalShow = TrafficValue(value: total).show;
+    final progress = total == 0 ? 0.0 : use / total;
+    final expireShow = userInfo.expire == 0
+        ? "长期有效"
+        : DateTime.fromMillisecondsSinceEpoch(userInfo.expire * 1000).show;
+    return Container(
+      padding: const EdgeInsets.symmetric(vertical: 4),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          for (final profile in state.profiles)
-            GridItem(
-              child: _profileItem(
-                profile: profile,
-                groupValue: state.currentProfileId,
-                onChanged: globalState.appController.changeProfileDebounce,
+          Row(
+            mainAxisSize: MainAxisSize.max,
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text(
+                profile.label ?? profile.id,
+                style: textTheme.titleMedium,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
               ),
-            ),
+              Text(
+                profile.lastUpdateDate?.lastUpdateTimeDesc ?? '',
+                style: textTheme.labelMedium?.toLight(),
+              ),
+            ],
+          ),
+          Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Container(
+                margin: const EdgeInsets.symmetric(
+                  vertical: 8,
+                ),
+                child: LinearProgressIndicator(
+                  minHeight: 6,
+                  value: progress,
+                ),
+              ),
+              Text(
+                "$useShow / $totalShow",
+                style: textTheme.labelMedium?.toLight(),
+              ),
+              const SizedBox(
+                height: 2,
+              ),
+              Row(
+                children: [
+                  Text(
+                    "到期时间:",
+                    style: textTheme.labelMedium?.toLighter(),
+                  ),
+                  const SizedBox(
+                    width: 4,
+                  ),
+                  Text(
+                    expireShow,
+                    style: textTheme.labelMedium?.toLighter(),
+                  ),
+                ],
+              )
+            ],
+          ),
         ],
       ),
     );
@@ -220,55 +276,65 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
 
   @override
   Widget build(BuildContext context) {
-    return FloatLayout(
-      floatingWidget: Container(
-        margin: const EdgeInsets.all(kFloatingActionButtonMargin),
-        child: FloatingActionButton(
-          heroTag: null,
-          onPressed: _handleShowAddExtendPage,
-          child: const Icon(Icons.add),
+    final profile = widget.profile;
+    final groupValue = widget.groupValue;
+    final onChanged = widget.onChanged;
+    return Selector<AppState, ViewMode>(
+      selector: (_, appState) => appState.viewMode,
+      builder: (_, viewMode, child) {
+        if (viewMode == ViewMode.mobile) {
+          return child!;
+        }
+        return CommonCard(
+          child: child!,
+        );
+      },
+      child: ListItem.radio(
+        key: Key(profile.id),
+        horizontalTitleGap: 16,
+        delegate: RadioDelegate<String?>(
+          value: profile.id,
+          groupValue: groupValue,
+          onChanged: onChanged,
         ),
-      ),
-      child: Selector<Config, ProfilesSelectorState>(
-        selector: (_, config) => ProfilesSelectorState(
-          profiles: config.profiles,
-          currentProfileId: config.currentProfileId,
-        ),
-        builder: (context, state, child) {
-          if (state.profiles.isEmpty) {
-            return NullStatus(
-              label: appLocalizations.nullProfileDesc,
-            );
-          }
-          return Align(
-            alignment: Alignment.topCenter,
-            child: SlotLayout(
-              config: {
-                Breakpoints.small: SlotLayout.from(
-                  key: const Key('profiles_grid_small'),
-                  builder: (_) => _buildGrid(
-                    state: state,
-                    crossAxisCount: 1,
-                  ),
-                ),
-                Breakpoints.medium: SlotLayout.from(
-                  key: const Key('profiles_grid_medium'),
-                  builder: (_) => _buildGrid(
-                    state: state,
-                    crossAxisCount: 1,
-                  ),
-                ),
-                Breakpoints.large: SlotLayout.from(
-                  key: const Key('profiles_grid_large'),
-                  builder: (_) => _buildGrid(
-                    state: state,
-                    crossAxisCount: 2,
-                  ),
-                ),
-              },
+        padding: const EdgeInsets.symmetric(horizontal: 16),
+        trailing: CommonPopupMenu<ProfileActions>(
+          items: [
+            CommonPopupMenuItem(
+              action: ProfileActions.edit,
+              label: appLocalizations.edit,
+              iconData: Icons.edit,
             ),
-          );
-        },
+            if (profile.type == ProfileType.url)
+              CommonPopupMenuItem(
+                action: ProfileActions.update,
+                label: appLocalizations.update,
+                iconData: Icons.sync,
+              ),
+            CommonPopupMenuItem(
+              action: ProfileActions.delete,
+              label: appLocalizations.delete,
+              iconData: Icons.delete,
+            ),
+          ],
+          onSelected: (ProfileActions? action) async {
+            switch (action) {
+              case ProfileActions.edit:
+                _handleShowEditExtendPage(profile);
+                break;
+              case ProfileActions.delete:
+                _handleDeleteProfile(profile.id);
+                break;
+              case ProfileActions.update:
+                _handleUpdateProfile(profile.id);
+                break;
+              case null:
+                break;
+            }
+          },
+        ),
+        title: _buildTitle(profile),
+        tileTitleAlignment: ListTileTitleAlignment.titleHeight,
       ),
     );
   }

lib/fragments/proxies.dart

@@ -1,6 +1,6 @@
+import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
 import 'package:provider/provider.dart';
 
 import '../enum/enum.dart';
@@ -51,6 +51,9 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
               selectedValue: proxiesSortType,
             );
           },
+        ),
+        const SizedBox(
+          width: 8,
         )
       ];
     });
@@ -58,72 +61,69 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
 
   @override
   Widget build(BuildContext context) {
-    return DelayTestButtonContainer(
-      child: Selector<AppState, bool>(
-        selector: (_, appState) => appState.currentLabel == 'proxies',
-        builder: (_, isCurrent, child) {
-          if (isCurrent) {
-            _initActions();
-          }
-          return child!;
+    return Selector<AppState, bool>(
+      selector: (_, appState) => appState.currentLabel == 'proxies',
+      builder: (_, isCurrent, child) {
+        if (isCurrent) {
+          _initActions();
+        }
+        return child!;
+      },
+      child: Selector3<AppState, Config, ClashConfig, ProxiesSelectorState>(
+        selector: (_, appState, config, clashConfig) {
+          final currentGroups = appState.currentGroups;
+          final groupNames = currentGroups.map((e) => e.name).toList();
+          return ProxiesSelectorState(
+            groupNames: groupNames,
+          );
         },
-        child: Selector3<AppState, Config, ClashConfig, ProxiesSelectorState>(
-          selector: (_, appState, config, clashConfig) {
-            final currentGroups = appState.currentGroups;
-            final groupNames = currentGroups.map((e) => e.name).toList();
-            return ProxiesSelectorState(
-              groupNames: groupNames,
-            );
-          },
-          shouldRebuild: (prev, next) {
-            if (prev.groupNames.length != next.groupNames.length) {
-              _tabController?.dispose();
-              _tabController = null;
-            }
-            return prev != next;
-          },
-          builder: (_, state, __) {
-            _tabController ??= TabController(
-              length: state.groupNames.length,
-              vsync: this,
-            );
-            return Column(
-              mainAxisAlignment: MainAxisAlignment.start,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                TabBar(
+        shouldRebuild: (prev, next) {
+          if (prev.groupNames.length != next.groupNames.length) {
+            _tabController?.dispose();
+            _tabController = null;
+          }
+          return prev != next;
+        },
+        builder: (_, state, __) {
+          _tabController ??= TabController(
+            length: state.groupNames.length,
+            vsync: this,
+          );
+          return Column(
+            mainAxisAlignment: MainAxisAlignment.start,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              TabBar(
+                controller: _tabController,
+                padding: const EdgeInsets.symmetric(horizontal: 16),
+                dividerColor: Colors.transparent,
+                isScrollable: true,
+                tabAlignment: TabAlignment.start,
+                overlayColor: const WidgetStatePropertyAll(Colors.transparent),
+                tabs: [
+                  for (final groupName in state.groupNames)
+                    Tab(
+                      text: groupName,
+                    ),
+                ],
+              ),
+              Expanded(
+                child: TabBarView(
                   controller: _tabController,
-                  padding: const EdgeInsets.symmetric(horizontal: 16),
-                  dividerColor: Colors.transparent,
-                  isScrollable: true,
-                  tabAlignment: TabAlignment.start,
-                  overlayColor:
-                      const MaterialStatePropertyAll(Colors.transparent),
-                  tabs: [
+                  children: [
                     for (final groupName in state.groupNames)
-                      Tab(
-                        text: groupName,
+                      KeepContainer(
+                        key: ObjectKey(groupName),
+                        child: ProxiesTabView(
+                          groupName: groupName,
+                        ),
                       ),
                   ],
                 ),
-                Expanded(
-                  child: TabBarView(
-                    controller: _tabController,
-                    children: [
-                      for (final groupName in state.groupNames)
-                        KeepContainer(
-                          key: ObjectKey(groupName),
-                          child: ProxiesTabView(
-                            groupName: groupName,
-                          ),
-                        ),
-                    ],
-                  ),
-                )
-              ],
-            );
-          },
-        ),
+              )
+            ],
+          );
+        },
       ),
     );
   }
@@ -149,8 +149,8 @@ class ProxiesTabView extends StatelessWidget {
     return proxies = List.of(proxies)
       ..sort(
         (a, b) {
-          final aDelay = appState.delayMap[a.name];
-          final bDelay = appState.delayMap[b.name];
+          final aDelay = appState.getDelay(a.name);
+          final bDelay = appState.getDelay(b.name);
           if (aDelay == null && bDelay == null) {
             return 0;
           }
@@ -186,167 +186,32 @@ class ProxiesTabView extends StatelessWidget {
         8 * 2;
   }
 
-  _card(
-    BuildContext context, {
-    required void Function() onPressed,
-    required bool isSelected,
-    required Proxy proxy,
-  }) {
-    final measure = globalState.appController.measure;
-    return CommonCard(
-      isSelected: isSelected,
-      onPressed: onPressed,
-      selectWidget: Container(
-        alignment: Alignment.topRight,
-        margin: const EdgeInsets.all(8),
-        child: Container(
-          padding: const EdgeInsets.all(4),
-          decoration: BoxDecoration(
-            shape: BoxShape.circle,
-            color: Theme.of(context).colorScheme.secondaryContainer,
-          ),
-          child: const SelectIcon(),
-        ),
-      ),
-      child: Padding(
-        padding: const EdgeInsets.all(12),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            SizedBox(
-              height: measure.bodyMediumHeight * 2,
-              child: Text(
-                proxy.name,
-                maxLines: 2,
-                style: context.textTheme.bodyMedium?.copyWith(
-                  overflow: TextOverflow.ellipsis,
-                ),
-              ),
-            ),
-            const SizedBox(
-              height: 8,
-            ),
-            SizedBox(
-              height: measure.bodySmallHeight,
-              child: Selector<AppState, String>(
-                selector: (context, appState) => appState.getDesc(
-                  proxy.type,
-                  proxy.name,
-                ),
-                builder: (_, desc, __) {
-                  return TooltipText(
-                    text: Text(
-                      desc,
-                      style: context.textTheme.bodySmall?.copyWith(
-                        overflow: TextOverflow.ellipsis,
-                        color: context.textTheme.bodySmall?.color?.toLight(),
-                      ),
-                    ),
-                  );
-                },
-              ),
-            ),
-            const SizedBox(
-              height: 8,
-            ),
-            SizedBox(
-              height: measure.labelSmallHeight,
-              child: Selector<AppState, int?>(
-                selector: (context, appState) => appState.getDelay(
-                  proxy.name,
-                ),
-                builder: (_, delay, __) {
-                  return FadeBox(
-                    child: Builder(
-                      builder: (_) {
-                        if (delay == null) {
-                          return Container();
-                        }
-                        if (delay == 0) {
-                          return SizedBox(
-                            height: measure.labelSmallHeight,
-                            width: measure.labelSmallHeight,
-                            child: const CircularProgressIndicator(
-                              strokeWidth: 2,
-                            ),
-                          );
-                        }
-                        return Text(
-                          delay > 0 ? '$delay ms' : "Timeout",
-                          style: context.textTheme.labelSmall?.copyWith(
-                            overflow: TextOverflow.ellipsis,
-                            color: other.getDelayColor(
-                              delay,
-                            ),
-                          ),
-                        );
-                      },
-                    ),
-                  );
-                },
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
+  int _getColumns(ViewMode viewMode) {
+    switch (viewMode) {
+      case ViewMode.mobile:
+        return 2;
+      case ViewMode.laptop:
+        return 3;
+      case ViewMode.desktop:
+        return 4;
+    }
   }
 
-  Widget _buildGrid(
-    BuildContext context, {
-    required List<Proxy> proxies,
-    required int columns,
-  }) {
-    return GridView.builder(
-      padding: const EdgeInsets.all(16),
-      gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-        crossAxisCount: columns,
-        mainAxisSpacing: 8,
-        crossAxisSpacing: 8,
-        mainAxisExtent: _getItemHeight(context),
-      ),
-      itemCount: proxies.length,
-      itemBuilder: (_, index) {
-        final proxy = proxies[index];
-        return Selector3<AppState, Config, ClashConfig,
-            ProxiesCardSelectorState>(
-          selector: (_, appState, config, clashConfig) {
-            final group = appState.getGroupWithName(groupName)!;
-            bool isSelected = config.currentSelectedMap[group.name] == proxy.name ||
-                (config.currentSelectedMap[group.name] == null &&
-                    group.now == proxy.name);
-            return ProxiesCardSelectorState(
-              isSelected: isSelected,
-            );
-          },
-          builder: (_, state, __) {
-            return _card(
-              context,
-              isSelected: state.isSelected,
-              onPressed: () {
-                final appController = globalState.appController;
-                final group =
-                    appController.appState.getGroupWithName(groupName)!;
-                if (group.type != GroupType.Selector) {
-                  globalState.showSnackBar(
-                    context,
-                    message: appLocalizations.notSelectedTip,
-                  );
-                  return;
-                }
-                globalState.appController.config.updateCurrentSelectedMap(
-                  groupName,
-                  proxy.name,
-                );
-                globalState.appController.changeProxy();
-              },
-              proxy: proxy,
-            );
-          },
-        );
-      },
-    );
+  _delayTest(List<Proxy> proxies) async {
+    for (final proxy in proxies) {
+      final appController = globalState.appController;
+      final proxyName = appController.appState.getRealProxyName(proxy.name) ?? proxy.name;
+      globalState.appController.setDelay(
+        Delay(
+          name: proxyName,
+          value: 0,
+        ),
+      );
+      clashCore.getDelay(proxyName).then((delay) {
+        globalState.appController.setDelay(delay);
+      });
+    }
+    await Future.delayed(httpTimeoutDuration + moreDuration);
   }
 
   @override
@@ -357,6 +222,7 @@ class ProxiesTabView extends StatelessWidget {
           proxiesSortType: config.proxiesSortType,
           sortNum: appState.sortNum,
           group: appState.getGroupWithName(groupName)!,
+          viewMode: appState.viewMode,
         );
       },
       builder: (_, state, __) {
@@ -365,35 +231,175 @@ class ProxiesTabView extends StatelessWidget {
           state.group.all,
           state.proxiesSortType,
         );
-        return Align(
-          alignment: Alignment.topCenter,
-          child: SlotLayout(
-            config: {
-              Breakpoints.small: SlotLayout.from(
-                key: const Key('proxies_grid_small'),
-                builder: (_) => _buildGrid(
-                  context,
-                  proxies: proxies,
-                  columns: 2,
-                ),
+        return DelayTestButtonContainer(
+          onClick: () async {
+            await _delayTest(
+              state.group.all,
+            );
+          },
+          child: Align(
+            alignment: Alignment.topCenter,
+            child: GridView.builder(
+              padding: const EdgeInsets.all(16),
+              gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                crossAxisCount: _getColumns(state.viewMode),
+                mainAxisSpacing: 8,
+                crossAxisSpacing: 8,
+                mainAxisExtent: _getItemHeight(context),
               ),
-              Breakpoints.medium: SlotLayout.from(
-                key: const Key('proxies_grid_medium'),
-                builder: (_) => _buildGrid(
-                  context,
-                  proxies: proxies,
-                  columns: 3,
-                ),
+              itemCount: proxies.length,
+              itemBuilder: (_, index) {
+                final proxy = proxies[index];
+                return ProxyCard(
+                  key: ValueKey('$groupName.${proxy.name}'),
+                  proxy: proxy,
+                  groupName: groupName,
+                );
+              },
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
+
+class ProxyCard extends StatelessWidget {
+  final String groupName;
+  final Proxy proxy;
+
+  const ProxyCard({
+    super.key,
+    required this.groupName,
+    required this.proxy,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final measure = globalState.appController.measure;
+    return Selector3<AppState, Config, ClashConfig, ProxiesCardSelectorState>(
+      selector: (_, appState, config, clashConfig) {
+        final group = appState.getGroupWithName(groupName)!;
+        bool isSelected = config.currentSelectedMap[group.name] == proxy.name ||
+            (config.currentSelectedMap[group.name] == null &&
+                group.now == proxy.name);
+        return ProxiesCardSelectorState(
+          isSelected: isSelected,
+        );
+      },
+      builder: (_, state, __) {
+        return CommonCard(
+          isSelected: state.isSelected,
+          onPressed: () {
+            final appController = globalState.appController;
+            final group = appController.appState.getGroupWithName(groupName)!;
+            if (group.type != GroupType.Selector) {
+              globalState.showSnackBar(
+                context,
+                message: appLocalizations.notSelectedTip,
+              );
+              return;
+            }
+            globalState.appController.config.updateCurrentSelectedMap(
+              groupName,
+              proxy.name,
+            );
+            globalState.appController.changeProxy();
+          },
+          selectWidget: Container(
+            alignment: Alignment.topRight,
+            margin: const EdgeInsets.all(8),
+            child: Container(
+              padding: const EdgeInsets.all(4),
+              decoration: BoxDecoration(
+                shape: BoxShape.circle,
+                color: Theme.of(context).colorScheme.secondaryContainer,
               ),
-              Breakpoints.large: SlotLayout.from(
-                key: const Key('proxies_grid_large'),
-                builder: (_) => _buildGrid(
-                  context,
-                  proxies: proxies,
-                  columns: 4,
+              child: const SelectIcon(),
+            ),
+          ),
+          child: Padding(
+            padding: const EdgeInsets.all(12),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                SizedBox(
+                  height: measure.bodyMediumHeight * 2,
+                  child: Text(
+                    proxy.name,
+                    maxLines: 2,
+                    style: context.textTheme.bodyMedium?.copyWith(
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                  ),
                 ),
-              ),
-            },
+                const SizedBox(
+                  height: 8,
+                ),
+                SizedBox(
+                  height: measure.bodySmallHeight,
+                  child: Selector<AppState, String>(
+                    selector: (context, appState) => appState.getDesc(
+                      proxy.type,
+                      proxy.name,
+                    ),
+                    builder: (_, desc, __) {
+                      return TooltipText(
+                        text: Text(
+                          desc,
+                          style: context.textTheme.bodySmall?.copyWith(
+                            overflow: TextOverflow.ellipsis,
+                            color:
+                                context.textTheme.bodySmall?.color?.toLight(),
+                          ),
+                        ),
+                      );
+                    },
+                  ),
+                ),
+                const SizedBox(
+                  height: 8,
+                ),
+                SizedBox(
+                  height: measure.labelSmallHeight,
+                  child: Selector<AppState, int?>(
+                    selector: (context, appState) => appState.getDelay(
+                      proxy.name,
+                    ),
+                    builder: (_, delay, __) {
+                      return FadeBox(
+                        child: Builder(
+                          builder: (_) {
+                            if (delay == null) {
+                              return Container();
+                            }
+                            if (delay == 0) {
+                              return SizedBox(
+                                height: measure.labelSmallHeight,
+                                width: measure.labelSmallHeight,
+                                child: const CircularProgressIndicator(
+                                  strokeWidth: 2,
+                                ),
+                              );
+                            }
+                            return Text(
+                              delay > 0 ? '$delay ms' : "Timeout",
+                              style: context.textTheme.labelSmall?.copyWith(
+                                overflow: TextOverflow.ellipsis,
+                                color: other.getDelayColor(
+                                  delay,
+                                ),
+                              ),
+                            );
+                          },
+                        ),
+                      );
+                    },
+                  ),
+                ),
+              ],
+            ),
           ),
         );
       },
@@ -403,10 +409,12 @@ class ProxiesTabView extends StatelessWidget {
 
 class DelayTestButtonContainer extends StatefulWidget {
   final Widget child;
+  final Future Function() onClick;
 
   const DelayTestButtonContainer({
     super.key,
     required this.child,
+    required this.onClick,
   });
 
   @override
@@ -418,14 +426,10 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
     with SingleTickerProviderStateMixin {
   late AnimationController _controller;
   late Animation<double> _scale;
-  late Animation<double> _opacity;
 
   _healthcheck() async {
     _controller.forward();
-    globalState.appController.healthcheck();
-    await Future.delayed(
-      appConstant.httpTimeoutDuration + appConstant.moreDuration,
-    );
+    await widget.onClick();
     _controller.reverse();
   }
 
@@ -435,7 +439,7 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
     _controller = AnimationController(
       vsync: this,
       duration: const Duration(
-        milliseconds: 300,
+        milliseconds: 200,
       ),
     );
     _scale = Tween<double>(
@@ -447,20 +451,6 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
         curve: const Interval(
           0,
           1,
-          curve: Curves.easeIn,
-        ),
-      ),
-    );
-    _opacity = Tween<double>(
-      begin: 1.0,
-      end: 0.0,
-    ).animate(
-      CurvedAnimation(
-        parent: _controller,
-        curve: const Interval(
-          0,
-          1,
-          curve: Curves.easeIn,
         ),
       ),
     );
@@ -474,6 +464,7 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
 
   @override
   Widget build(BuildContext context) {
+    _controller.reverse();
     return FloatLayout(
       floatingWidget: FloatWrapper(
         child: AnimatedBuilder(
@@ -484,10 +475,7 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
               height: 56,
               child: Transform.scale(
                 scale: _scale.value,
-                child: Opacity(
-                  opacity: _opacity.value,
-                  child: child!,
-                ),
+                child: child,
               ),
             );
           },

lib/fragments/resources.dart

@@ -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(),
+      ],
+    );
+  }
+}

lib/fragments/theme.dart

@@ -109,7 +109,7 @@ class ThemeFragment extends StatelessWidget {
     ];
     List<Color?> primaryColors = [
       null,
-      appConstant.defaultPrimaryColor,
+      defaultPrimaryColor,
       Colors.pinkAccent,
       Colors.greenAccent,
       Colors.yellowAccent,

lib/fragments/tools.dart

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

lib/l10n/arb/intl_en.arb

@@ -9,6 +9,8 @@
   "tools": "Tools",
   "logs": "Logs",
   "logsDesc": "Log capture records",
+  "resources": "Resources",
+  "resourcesDesc": "External resource related info",
   "trafficUsage": "Traffic usage",
   "coreInfo": "Core info",
   "nullCoreInfoDesc": "Unable to obtain core info",
@@ -47,6 +49,8 @@
   "autoRunDesc": "Auto run when the application is opened",
   "logcat": "Logcat",
   "logcatDesc": "Disabling will hide the log entry",
+  "autoCheckUpdate": "Auto check updates",
+  "autoCheckUpdateDesc": "Auto check for updates when the app starts",
   "accessControl": "AccessControl",
   "accessControlDesc": "Configure application access proxy",
   "application": "Application",
@@ -114,7 +118,6 @@
   "systemProxy": "SystemProxy",
   "project": "Project",
   "core": "Core",
-  "checkUpdate": "Check update",
   "tabAnimation": "Tab animation",
   "tabAnimationDesc": "When enabled, the home tab will add a toggle animation",
   "desc": "A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.",
@@ -124,5 +127,39 @@
   "compatible": "Compatibility mode",
   "compatibleDesc": "Opening it will lose part of its application ability and gain the support of full amount of Clash.",
   "notSelectedTip": "The current proxy group cannot be selected.",
-  "tip": "tip"
+  "tip": "tip",
+  "backupAndRecovery": "Backup and Recovery",
+  "backupAndRecoveryDesc": "Sync data by WebDAV",
+  "account": "Account",
+  "backup": "Backup",
+  "backupDesc": "Backup local data to WebDAV",
+  "recovery": "Recovery",
+  "recoveryDesc": "Recovery data from WebDAV",
+  "recoveryProfiles": "Only recovery profiles",
+  "recoveryAll": "Recovery all data",
+  "recoverySuccess": "Recovery success",
+  "backupSuccess": "Backup success",
+  "noInfo": "No info",
+  "pleaseBindWebDAV": "Please bind WebDAV",
+  "bind": "Bind",
+  "connectivity": "Connectivity：",
+  "webDAVConfiguration": "WebDAV configuration",
+  "address": "Address",
+  "addressHelp": "WebDAV server address",
+  "addressTip": "Please enter a valid WebDAV address",
+  "password": "Password",
+  "passwordTip": "Password cannot be empty",
+  "accountTip": "Account cannot be empty",
+  "checkUpdate": "Check for updates",
+  "discoverNewVersion": "Discover the new version",
+  "checkUpdateError": "The current application is already the latest version",
+  "goDownload": "Go to download",
+  "unknown": "Unknown",
+  "geoData": "GeoData",
+  "externalResources": "External resources",
+  "checking": "Checking...",
+  "country": "Country",
+  "checkError": "Check error",
+  "ipCheckTimeout": "Ip check timeout",
+  "search": "Search"
 }

lib/l10n/arb/intl_zh_CN.arb

@@ -9,6 +9,8 @@
   "tools": "工具",
   "logs": "日志",
   "logsDesc": "日志捕获记录",
+  "resources": "资源",
+  "resourcesDesc": "外部资源相关信息",
   "trafficUsage": "流量统计",
   "coreInfo": "内核信息",
   "nullCoreInfoDesc": "无法获取内核信息",
@@ -47,6 +49,8 @@
   "autoRunDesc": "应用打开时自动运行",
   "logcat": "日志捕获",
   "logcatDesc": "禁用将会隐藏日志入口",
+  "autoCheckUpdate": "自动检查更新",
+  "autoCheckUpdateDesc": "应用启动时自动检查更新",
   "accessControl": "访问控制",
   "accessControlDesc": "配置应用访问代理",
   "application": "应用程序",
@@ -114,7 +118,6 @@
   "systemProxy": "系统代理",
   "project": "项目",
   "core": "内核",
-  "checkUpdate": "检查更新",
   "tabAnimation": "选项卡动画",
   "tabAnimationDesc": "开启后，主页选项卡将添加切换动画",
   "desc": "基于ClashMeta的多平台代理客户端，简单易用，开源无广告。",
@@ -124,5 +127,39 @@
   "compatible": "兼容模式",
   "compatibleDesc": "开启将失去部分应用能力，获得全量的Clash的支持",
   "notSelectedTip": "当前代理组无法选中",
-  "tip": "提示"
+  "tip": "提示",
+  "backupAndRecovery": "备份与恢复",
+  "backupAndRecoveryDesc": "通过WebDAV同步数据",
+  "account": "账号",
+  "backup": "备份",
+  "backupDesc": "备份数据到WebDAV",
+  "recovery": "恢复",
+  "recoveryDesc": "从WebDAV恢复数据",
+  "recoveryProfiles": "仅恢复配置文件",
+  "recoveryAll": "恢复所有数据",
+  "recoverySuccess": "恢复成功",
+  "backupSuccess": "备份成功",
+  "noInfo": "暂无信息",
+  "pleaseBindWebDAV": "请绑定WebDAV",
+  "bind": "绑定",
+  "connectivity": "连通性：",
+  "webDAVConfiguration": "WebDAV配置",
+  "address": "地址",
+  "addressHelp": "WebDAV服务器地址",
+  "addressTip": "请输入有效的WebDAV地址",
+  "password": "密码",
+  "passwordTip": "密码不能为空",
+  "accountTip": "账号不能为空",
+  "checkUpdate": "检查更新",
+  "discoverNewVersion": "发现新版本",
+  "checkUpdateError": "当前应用已经是最新版了",
+  "goDownload": "前往下载",
+  "unknown": "未知",
+  "geoData": "地理数据",
+  "externalResources": "外部资源",
+  "checking": "检测中...",
+  "country": "区域",
+  "checkError": "检测失败",
+  "ipCheckTimeout": "Ip检测超时",
+  "search": "搜索"
 }

lib/l10n/intl/messages_en.dart

@@ -30,7 +30,15 @@ class MessageLookup extends MessageLookupByLibrary {
             "Configure application access proxy"),
         "accessControlNotAllowDesc": MessageLookupByLibrary.simpleMessage(
             "The selected application will be excluded from VPN"),
+        "account": MessageLookupByLibrary.simpleMessage("Account"),
+        "accountTip":
+            MessageLookupByLibrary.simpleMessage("Account cannot be empty"),
         "add": MessageLookupByLibrary.simpleMessage("Add"),
+        "address": MessageLookupByLibrary.simpleMessage("Address"),
+        "addressHelp":
+            MessageLookupByLibrary.simpleMessage("WebDAV server address"),
+        "addressTip": MessageLookupByLibrary.simpleMessage(
+            "Please enter a valid WebDAV address"),
         "ago": MessageLookupByLibrary.simpleMessage(" Ago"),
         "allowLan": MessageLookupByLibrary.simpleMessage("AllowLan"),
         "allowLanDesc": MessageLookupByLibrary.simpleMessage(
@@ -41,6 +49,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "applicationDesc": MessageLookupByLibrary.simpleMessage(
             "Modify application related settings"),
         "auto": MessageLookupByLibrary.simpleMessage("Auto"),
+        "autoCheckUpdate":
+            MessageLookupByLibrary.simpleMessage("Auto check updates"),
+        "autoCheckUpdateDesc": MessageLookupByLibrary.simpleMessage(
+            "Auto check for updates when the app starts"),
         "autoLaunch": MessageLookupByLibrary.simpleMessage("AutoLaunch"),
         "autoLaunchDesc": MessageLookupByLibrary.simpleMessage(
             "Follow the system self startup"),
@@ -50,19 +62,35 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoUpdate": MessageLookupByLibrary.simpleMessage("Auto update"),
         "autoUpdateInterval": MessageLookupByLibrary.simpleMessage(
             "Auto update interval (minutes)"),
+        "backup": MessageLookupByLibrary.simpleMessage("Backup"),
+        "backupAndRecovery":
+            MessageLookupByLibrary.simpleMessage("Backup and Recovery"),
+        "backupAndRecoveryDesc":
+            MessageLookupByLibrary.simpleMessage("Sync data by WebDAV"),
+        "backupDesc":
+            MessageLookupByLibrary.simpleMessage("Backup local data to WebDAV"),
+        "backupSuccess": MessageLookupByLibrary.simpleMessage("Backup success"),
+        "bind": MessageLookupByLibrary.simpleMessage("Bind"),
         "blacklistMode": MessageLookupByLibrary.simpleMessage("Blacklist mode"),
         "cancelFilterSystemApp":
             MessageLookupByLibrary.simpleMessage("Cancel filter system app"),
         "cancelSelectAll":
             MessageLookupByLibrary.simpleMessage("Cancel select all"),
-        "checkUpdate": MessageLookupByLibrary.simpleMessage("Check update"),
+        "checkError": MessageLookupByLibrary.simpleMessage("Check error"),
+        "checkUpdate":
+            MessageLookupByLibrary.simpleMessage("Check for updates"),
+        "checkUpdateError": MessageLookupByLibrary.simpleMessage(
+            "The current application is already the latest version"),
+        "checking": MessageLookupByLibrary.simpleMessage("Checking..."),
         "compatible":
             MessageLookupByLibrary.simpleMessage("Compatibility mode"),
         "compatibleDesc": MessageLookupByLibrary.simpleMessage(
             "Opening it will lose part of its application ability and gain the support of full amount of Clash."),
         "confirm": MessageLookupByLibrary.simpleMessage("Confirm"),
+        "connectivity": MessageLookupByLibrary.simpleMessage("Connectivity："),
         "core": MessageLookupByLibrary.simpleMessage("Core"),
         "coreInfo": MessageLookupByLibrary.simpleMessage("Core info"),
+        "country": MessageLookupByLibrary.simpleMessage("Country"),
         "create": MessageLookupByLibrary.simpleMessage("Create"),
         "dark": MessageLookupByLibrary.simpleMessage("Dark"),
         "dashboard": MessageLookupByLibrary.simpleMessage("Dashboard"),
@@ -74,6 +102,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "desc": MessageLookupByLibrary.simpleMessage(
             "A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free."),
         "direct": MessageLookupByLibrary.simpleMessage("Direct"),
+        "discoverNewVersion":
+            MessageLookupByLibrary.simpleMessage("Discover the new version"),
         "discovery":
             MessageLookupByLibrary.simpleMessage("Discovery a new version"),
         "doYouWantToPass":
@@ -82,15 +112,21 @@ class MessageLookup extends MessageLookupByLibrary {
         "edit": MessageLookupByLibrary.simpleMessage("Edit"),
         "en": MessageLookupByLibrary.simpleMessage("English"),
         "exit": MessageLookupByLibrary.simpleMessage("Exit"),
+        "externalResources":
+            MessageLookupByLibrary.simpleMessage("External resources"),
         "file": MessageLookupByLibrary.simpleMessage("File"),
         "fileDesc":
             MessageLookupByLibrary.simpleMessage("Directly upload profile"),
         "filterSystemApp":
             MessageLookupByLibrary.simpleMessage("Filter system app"),
+        "geoData": MessageLookupByLibrary.simpleMessage("GeoData"),
         "global": MessageLookupByLibrary.simpleMessage("Global"),
+        "goDownload": MessageLookupByLibrary.simpleMessage("Go to download"),
         "hours": MessageLookupByLibrary.simpleMessage("Hours"),
         "importFromURL":
             MessageLookupByLibrary.simpleMessage("Import from URL"),
+        "ipCheckTimeout":
+            MessageLookupByLibrary.simpleMessage("Ip check timeout"),
         "just": MessageLookupByLibrary.simpleMessage("Just"),
         "language": MessageLookupByLibrary.simpleMessage("Language"),
         "light": MessageLookupByLibrary.simpleMessage("Light"),
@@ -112,6 +148,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "networkDetection":
             MessageLookupByLibrary.simpleMessage("Network detection"),
         "networkSpeed": MessageLookupByLibrary.simpleMessage("Network speed"),
+        "noInfo": MessageLookupByLibrary.simpleMessage("No info"),
         "noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("No more info"),
         "noProxy": MessageLookupByLibrary.simpleMessage("No proxy"),
         "noProxyDesc": MessageLookupByLibrary.simpleMessage(
@@ -128,6 +165,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "override": MessageLookupByLibrary.simpleMessage("Override"),
         "overrideDesc": MessageLookupByLibrary.simpleMessage(
             "Override Proxy related config"),
+        "password": MessageLookupByLibrary.simpleMessage("Password"),
+        "passwordTip":
+            MessageLookupByLibrary.simpleMessage("Password cannot be empty"),
+        "pleaseBindWebDAV":
+            MessageLookupByLibrary.simpleMessage("Please bind WebDAV"),
         "pleaseUploadFile":
             MessageLookupByLibrary.simpleMessage("Please upload file"),
         "pleaseUploadValidQrcode": MessageLookupByLibrary.simpleMessage(
@@ -156,8 +198,21 @@ class MessageLookup extends MessageLookupByLibrary {
         "qrcode": MessageLookupByLibrary.simpleMessage("QR code"),
         "qrcodeDesc": MessageLookupByLibrary.simpleMessage(
             "Scan QR code to obtain profile"),
+        "recovery": MessageLookupByLibrary.simpleMessage("Recovery"),
+        "recoveryAll":
+            MessageLookupByLibrary.simpleMessage("Recovery all data"),
+        "recoveryDesc":
+            MessageLookupByLibrary.simpleMessage("Recovery data from WebDAV"),
+        "recoveryProfiles":
+            MessageLookupByLibrary.simpleMessage("Only recovery profiles"),
+        "recoverySuccess":
+            MessageLookupByLibrary.simpleMessage("Recovery success"),
+        "resources": MessageLookupByLibrary.simpleMessage("Resources"),
+        "resourcesDesc": MessageLookupByLibrary.simpleMessage(
+            "External resource related info"),
         "rule": MessageLookupByLibrary.simpleMessage("Rule"),
         "save": MessageLookupByLibrary.simpleMessage("Save"),
+        "search": MessageLookupByLibrary.simpleMessage("Search"),
         "selectAll": MessageLookupByLibrary.simpleMessage("Select all"),
         "selected": MessageLookupByLibrary.simpleMessage("Selected"),
         "settings": MessageLookupByLibrary.simpleMessage("Settings"),
@@ -186,11 +241,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "unableToUpdateCurrentProfileDesc":
             MessageLookupByLibrary.simpleMessage(
                 "unable to update current profile"),
+        "unknown": MessageLookupByLibrary.simpleMessage("Unknown"),
         "update": MessageLookupByLibrary.simpleMessage("Update"),
         "upload": MessageLookupByLibrary.simpleMessage("Upload"),
         "url": MessageLookupByLibrary.simpleMessage("URL"),
         "urlDesc":
             MessageLookupByLibrary.simpleMessage("Obtain profile through URL"),
+        "webDAVConfiguration":
+            MessageLookupByLibrary.simpleMessage("WebDAV configuration"),
         "whitelistMode": MessageLookupByLibrary.simpleMessage("Whitelist mode"),
         "years": MessageLookupByLibrary.simpleMessage("Years"),
         "zh_CN": MessageLookupByLibrary.simpleMessage("Simplified Chinese")

lib/l10n/intl/messages_zh_CN.dart

@@ -29,7 +29,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "accessControlDesc": MessageLookupByLibrary.simpleMessage("配置应用访问代理"),
         "accessControlNotAllowDesc":
             MessageLookupByLibrary.simpleMessage("选中应用将会被排除在VPN之外"),
+        "account": MessageLookupByLibrary.simpleMessage("账号"),
+        "accountTip": MessageLookupByLibrary.simpleMessage("账号不能为空"),
         "add": MessageLookupByLibrary.simpleMessage("添加"),
+        "address": MessageLookupByLibrary.simpleMessage("地址"),
+        "addressHelp": MessageLookupByLibrary.simpleMessage("WebDAV服务器地址"),
+        "addressTip": MessageLookupByLibrary.simpleMessage("请输入有效的WebDAV地址"),
         "ago": MessageLookupByLibrary.simpleMessage("前"),
         "allowLan": MessageLookupByLibrary.simpleMessage("局域网代理"),
         "allowLanDesc": MessageLookupByLibrary.simpleMessage("允许通过局域网访问代理"),
@@ -37,6 +42,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "application": MessageLookupByLibrary.simpleMessage("应用程序"),
         "applicationDesc": MessageLookupByLibrary.simpleMessage("修改应用程序相关设置"),
         "auto": MessageLookupByLibrary.simpleMessage("自动"),
+        "autoCheckUpdate": MessageLookupByLibrary.simpleMessage("自动检查更新"),
+        "autoCheckUpdateDesc":
+            MessageLookupByLibrary.simpleMessage("应用启动时自动检查更新"),
         "autoLaunch": MessageLookupByLibrary.simpleMessage("自启动"),
         "autoLaunchDesc": MessageLookupByLibrary.simpleMessage("跟随系统自启动"),
         "autoRun": MessageLookupByLibrary.simpleMessage("自动运行"),
@@ -44,17 +52,29 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoUpdate": MessageLookupByLibrary.simpleMessage("自动更新"),
         "autoUpdateInterval":
             MessageLookupByLibrary.simpleMessage("自动更新间隔（分钟）"),
+        "backup": MessageLookupByLibrary.simpleMessage("备份"),
+        "backupAndRecovery": MessageLookupByLibrary.simpleMessage("备份与恢复"),
+        "backupAndRecoveryDesc":
+            MessageLookupByLibrary.simpleMessage("通过WebDAV同步数据"),
+        "backupDesc": MessageLookupByLibrary.simpleMessage("备份数据到WebDAV"),
+        "backupSuccess": MessageLookupByLibrary.simpleMessage("备份成功"),
+        "bind": MessageLookupByLibrary.simpleMessage("绑定"),
         "blacklistMode": MessageLookupByLibrary.simpleMessage("黑名单模式"),
         "cancelFilterSystemApp":
             MessageLookupByLibrary.simpleMessage("取消过滤系统应用"),
         "cancelSelectAll": MessageLookupByLibrary.simpleMessage("取消全选"),
+        "checkError": MessageLookupByLibrary.simpleMessage("检测失败"),
         "checkUpdate": MessageLookupByLibrary.simpleMessage("检查更新"),
+        "checkUpdateError": MessageLookupByLibrary.simpleMessage("当前应用已经是最新版了"),
+        "checking": MessageLookupByLibrary.simpleMessage("检测中..."),
         "compatible": MessageLookupByLibrary.simpleMessage("兼容模式"),
         "compatibleDesc":
             MessageLookupByLibrary.simpleMessage("开启将失去部分应用能力，获得全量的Clash的支持"),
         "confirm": MessageLookupByLibrary.simpleMessage("确定"),
+        "connectivity": MessageLookupByLibrary.simpleMessage("连通性："),
         "core": MessageLookupByLibrary.simpleMessage("内核"),
         "coreInfo": MessageLookupByLibrary.simpleMessage("内核信息"),
+        "country": MessageLookupByLibrary.simpleMessage("区域"),
         "create": MessageLookupByLibrary.simpleMessage("创建"),
         "dark": MessageLookupByLibrary.simpleMessage("深色"),
         "dashboard": MessageLookupByLibrary.simpleMessage("仪表盘"),
@@ -66,18 +86,23 @@ class MessageLookup extends MessageLookupByLibrary {
         "desc": MessageLookupByLibrary.simpleMessage(
             "基于ClashMeta的多平台代理客户端，简单易用，开源无广告。"),
         "direct": MessageLookupByLibrary.simpleMessage("直连"),
+        "discoverNewVersion": MessageLookupByLibrary.simpleMessage("发现新版本"),
         "discovery": MessageLookupByLibrary.simpleMessage("发现新版本"),
         "doYouWantToPass": MessageLookupByLibrary.simpleMessage("是否要通过"),
         "download": MessageLookupByLibrary.simpleMessage("下载"),
         "edit": MessageLookupByLibrary.simpleMessage("编辑"),
         "en": MessageLookupByLibrary.simpleMessage("英语"),
         "exit": MessageLookupByLibrary.simpleMessage("退出"),
+        "externalResources": MessageLookupByLibrary.simpleMessage("外部资源"),
         "file": MessageLookupByLibrary.simpleMessage("文件"),
         "fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
         "filterSystemApp": MessageLookupByLibrary.simpleMessage("过滤系统应用"),
+        "geoData": MessageLookupByLibrary.simpleMessage("地理数据"),
         "global": MessageLookupByLibrary.simpleMessage("全局"),
+        "goDownload": MessageLookupByLibrary.simpleMessage("前往下载"),
         "hours": MessageLookupByLibrary.simpleMessage("小时"),
         "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
+        "ipCheckTimeout": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
         "just": MessageLookupByLibrary.simpleMessage("刚刚"),
         "language": MessageLookupByLibrary.simpleMessage("语言"),
         "light": MessageLookupByLibrary.simpleMessage("浅色"),
@@ -96,6 +121,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "nameSort": MessageLookupByLibrary.simpleMessage("按名称排序"),
         "networkDetection": MessageLookupByLibrary.simpleMessage("网络检测"),
         "networkSpeed": MessageLookupByLibrary.simpleMessage("网络速度"),
+        "noInfo": MessageLookupByLibrary.simpleMessage("暂无信息"),
         "noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("暂无更多信息"),
         "noProxy": MessageLookupByLibrary.simpleMessage("暂无代理"),
         "noProxyDesc":
@@ -109,6 +135,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "outboundMode": MessageLookupByLibrary.simpleMessage("出站模式"),
         "override": MessageLookupByLibrary.simpleMessage("覆写"),
         "overrideDesc": MessageLookupByLibrary.simpleMessage("覆写代理相关配置"),
+        "password": MessageLookupByLibrary.simpleMessage("密码"),
+        "passwordTip": MessageLookupByLibrary.simpleMessage("密码不能为空"),
+        "pleaseBindWebDAV": MessageLookupByLibrary.simpleMessage("请绑定WebDAV"),
         "pleaseUploadFile": MessageLookupByLibrary.simpleMessage("请上传文件"),
         "pleaseUploadValidQrcode":
             MessageLookupByLibrary.simpleMessage("请上传有效的二维码"),
@@ -133,8 +162,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "proxyPort": MessageLookupByLibrary.simpleMessage("代理端口"),
         "qrcode": MessageLookupByLibrary.simpleMessage("二维码"),
         "qrcodeDesc": MessageLookupByLibrary.simpleMessage("扫描二维码获取配置文件"),
+        "recovery": MessageLookupByLibrary.simpleMessage("恢复"),
+        "recoveryAll": MessageLookupByLibrary.simpleMessage("恢复所有数据"),
+        "recoveryDesc": MessageLookupByLibrary.simpleMessage("从WebDAV恢复数据"),
+        "recoveryProfiles": MessageLookupByLibrary.simpleMessage("仅恢复配置文件"),
+        "recoverySuccess": MessageLookupByLibrary.simpleMessage("恢复成功"),
+        "resources": MessageLookupByLibrary.simpleMessage("资源"),
+        "resourcesDesc": MessageLookupByLibrary.simpleMessage("外部资源相关信息"),
         "rule": MessageLookupByLibrary.simpleMessage("规则"),
         "save": MessageLookupByLibrary.simpleMessage("保存"),
+        "search": MessageLookupByLibrary.simpleMessage("搜索"),
         "selectAll": MessageLookupByLibrary.simpleMessage("全选"),
         "selected": MessageLookupByLibrary.simpleMessage("已选择"),
         "settings": MessageLookupByLibrary.simpleMessage("设置"),
@@ -159,10 +196,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "tunDesc": MessageLookupByLibrary.simpleMessage("仅在管理员模式生效"),
         "unableToUpdateCurrentProfileDesc":
             MessageLookupByLibrary.simpleMessage("无法更新当前配置文件"),
+        "unknown": MessageLookupByLibrary.simpleMessage("未知"),
         "update": MessageLookupByLibrary.simpleMessage("更新"),
         "upload": MessageLookupByLibrary.simpleMessage("上传"),
         "url": MessageLookupByLibrary.simpleMessage("URL"),
         "urlDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
+        "webDAVConfiguration": MessageLookupByLibrary.simpleMessage("WebDAV配置"),
         "whitelistMode": MessageLookupByLibrary.simpleMessage("白名单模式"),
         "years": MessageLookupByLibrary.simpleMessage("年"),
         "zh_CN": MessageLookupByLibrary.simpleMessage("中文简体")

lib/l10n/l10n.dart

@@ -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`
   String get trafficUsage {
     return Intl.message(
@@ -530,6 +550,26 @@ class AppLocalizations {
     );
   }
 
+  /// `Auto check updates`
+  String get autoCheckUpdate {
+    return Intl.message(
+      'Auto check updates',
+      name: 'autoCheckUpdate',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Auto check for updates when the app starts`
+  String get autoCheckUpdateDesc {
+    return Intl.message(
+      'Auto check for updates when the app starts',
+      name: 'autoCheckUpdateDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `AccessControl`
   String get accessControl {
     return Intl.message(
@@ -1200,16 +1240,6 @@ class AppLocalizations {
     );
   }
 
-  /// `Check update`
-  String get checkUpdate {
-    return Intl.message(
-      'Check update',
-      name: 'checkUpdate',
-      desc: '',
-      args: [],
-    );
-  }
-
   /// `Tab animation`
   String get tabAnimation {
     return Intl.message(
@@ -1309,6 +1339,346 @@ class AppLocalizations {
       args: [],
     );
   }
+
+  /// `Backup and Recovery`
+  String get backupAndRecovery {
+    return Intl.message(
+      'Backup and Recovery',
+      name: 'backupAndRecovery',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Sync data by WebDAV`
+  String get backupAndRecoveryDesc {
+    return Intl.message(
+      'Sync data by WebDAV',
+      name: 'backupAndRecoveryDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Account`
+  String get account {
+    return Intl.message(
+      'Account',
+      name: 'account',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Backup`
+  String get backup {
+    return Intl.message(
+      'Backup',
+      name: 'backup',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Backup local data to WebDAV`
+  String get backupDesc {
+    return Intl.message(
+      'Backup local data to WebDAV',
+      name: 'backupDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Recovery`
+  String get recovery {
+    return Intl.message(
+      'Recovery',
+      name: 'recovery',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Recovery data from WebDAV`
+  String get recoveryDesc {
+    return Intl.message(
+      'Recovery data from WebDAV',
+      name: 'recoveryDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Only recovery profiles`
+  String get recoveryProfiles {
+    return Intl.message(
+      'Only recovery profiles',
+      name: 'recoveryProfiles',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Recovery all data`
+  String get recoveryAll {
+    return Intl.message(
+      'Recovery all data',
+      name: 'recoveryAll',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Recovery success`
+  String get recoverySuccess {
+    return Intl.message(
+      'Recovery success',
+      name: 'recoverySuccess',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Backup success`
+  String get backupSuccess {
+    return Intl.message(
+      'Backup success',
+      name: 'backupSuccess',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `No info`
+  String get noInfo {
+    return Intl.message(
+      'No info',
+      name: 'noInfo',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Please bind WebDAV`
+  String get pleaseBindWebDAV {
+    return Intl.message(
+      'Please bind WebDAV',
+      name: 'pleaseBindWebDAV',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Bind`
+  String get bind {
+    return Intl.message(
+      'Bind',
+      name: 'bind',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Connectivity：`
+  String get connectivity {
+    return Intl.message(
+      'Connectivity：',
+      name: 'connectivity',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `WebDAV configuration`
+  String get webDAVConfiguration {
+    return Intl.message(
+      'WebDAV configuration',
+      name: 'webDAVConfiguration',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Address`
+  String get address {
+    return Intl.message(
+      'Address',
+      name: 'address',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `WebDAV server address`
+  String get addressHelp {
+    return Intl.message(
+      'WebDAV server address',
+      name: 'addressHelp',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Please enter a valid WebDAV address`
+  String get addressTip {
+    return Intl.message(
+      'Please enter a valid WebDAV address',
+      name: 'addressTip',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Password`
+  String get password {
+    return Intl.message(
+      'Password',
+      name: 'password',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Password cannot be empty`
+  String get passwordTip {
+    return Intl.message(
+      'Password cannot be empty',
+      name: 'passwordTip',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Account cannot be empty`
+  String get accountTip {
+    return Intl.message(
+      'Account cannot be empty',
+      name: 'accountTip',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Check for updates`
+  String get checkUpdate {
+    return Intl.message(
+      'Check for updates',
+      name: 'checkUpdate',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Discover the new version`
+  String get discoverNewVersion {
+    return Intl.message(
+      'Discover the new version',
+      name: 'discoverNewVersion',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `The current application is already the latest version`
+  String get checkUpdateError {
+    return Intl.message(
+      'The current application is already the latest version',
+      name: 'checkUpdateError',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Go to download`
+  String get goDownload {
+    return Intl.message(
+      'Go to download',
+      name: 'goDownload',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `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: [],
+    );
+  }
+
+  /// `Checking...`
+  String get checking {
+    return Intl.message(
+      'Checking...',
+      name: 'checking',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Country`
+  String get country {
+    return Intl.message(
+      'Country',
+      name: 'country',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Check error`
+  String get checkError {
+    return Intl.message(
+      'Check error',
+      name: 'checkError',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Ip check timeout`
+  String get ipCheckTimeout {
+    return Intl.message(
+      'Ip check timeout',
+      name: 'ipCheckTimeout',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Search`
+  String get search {
+    return Intl.message(
+      'Search',
+      name: 'search',
+      desc: '',
+      args: [],
+    );
+  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {

lib/models/app.dart

@@ -1,10 +1,10 @@
 import 'package:collection/collection.dart';
+import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
 import 'ffi.dart';
 import 'log.dart';
 import 'navigation.dart';
-import 'package.dart';
 import 'profile.dart';
 import 'proxy.dart';
 import 'system_color_scheme.dart';
@@ -20,7 +20,6 @@ class AppState with ChangeNotifier {
   VersionInfo? _versionInfo;
   List<Traffic> _traffics;
   List<Log> _logs;
-  List<Package> _packages;
   String _currentLabel;
   SystemColorSchemes _systemColorSchemes;
   num _sortNum;
@@ -29,6 +28,7 @@ class AppState with ChangeNotifier {
   SelectedMap _selectedMap;
   bool _isCompatible;
   List<Group> _groups;
+  double _viewWidth;
 
   AppState({
     required Mode mode,
@@ -39,8 +39,8 @@ class AppState with ChangeNotifier {
         _currentLabel = "dashboard",
         _traffics = [],
         _logs = [],
+        _viewWidth = 0,
         _selectedMap = selectedMap,
-        _packages = [],
         _sortNum = 0,
         _mode = mode,
         _delayMap = {},
@@ -66,6 +66,20 @@ class AppState with ChangeNotifier {
     }
   }
 
+  List<NavigationItem> get currentNavigationItems {
+    NavigationItemMode navigationItemMode;
+    if (_viewWidth <= maxMobileWidth) {
+      navigationItemMode = NavigationItemMode.mobile;
+    } else {
+      navigationItemMode = NavigationItemMode.desktop;
+    }
+    return navigationItems
+        .where(
+          (element) => element.modes.contains(navigationItemMode),
+        )
+        .toList();
+  }
+
   bool get isInit => _isInit;
 
   set isInit(bool value) {
@@ -75,6 +89,8 @@ class AppState with ChangeNotifier {
     }
   }
 
+  bool get isStart => _runTime != null;
+
   int? get runTime => _runTime;
 
   set runTime(int? value) {
@@ -91,7 +107,7 @@ class AppState with ChangeNotifier {
     } else {
       final index = groups.indexWhere((element) => element.name == proxyName);
       if (index == -1) return type;
-      return "$type(${groups[index].now})";
+      return "$type(${groups[index].now ?? '*'})";
     }
   }
 
@@ -152,6 +168,9 @@ class AppState with ChangeNotifier {
 
   addLog(Log log) {
     _logs.add(log);
+    if (_logs.length > 60) {
+      _logs = _logs.sublist(_logs.length - 60);
+    }
     notifyListeners();
   }
 
@@ -164,15 +183,6 @@ class AppState with ChangeNotifier {
     }
   }
 
-  List<Package> get packages => _packages;
-
-  set packages(List<Package> value) {
-    if (_packages != value) {
-      _packages = value;
-      notifyListeners();
-    }
-  }
-
   List<Group> get groups => _groups;
 
   set groups(List<Group> value) {
@@ -200,19 +210,6 @@ class AppState with ChangeNotifier {
     }
   }
 
-  // String? get currentProxyName {
-  //   if (mode == Mode.direct) return UsedProxy.DIRECT.name;
-  //   if (_currentProxyName != null) return _currentProxyName!;
-  //   return currentGroup?.now;
-  // }
-  //
-  // set currentProxyName(String? value) {
-  //   if (_currentProxyName != value) {
-  //     _currentProxyName = value;
-  //     notifyListeners();
-  //   }
-  // }
-
   bool get isCompatible {
     return _isCompatible;
   }
@@ -250,6 +247,17 @@ class AppState with ChangeNotifier {
     }
   }
 
+  double get viewWidth => _viewWidth;
+
+  set viewWidth(double value) {
+    if (_viewWidth != value) {
+      _viewWidth = value;
+      notifyListeners();
+    }
+  }
+
+  ViewMode get viewMode => other.getViewMode(_viewWidth);
+
   DelayMap get delayMap {
     return _delayMap;
   }

lib/models/clash_config.dart

@@ -11,15 +11,13 @@ part 'generated/clash_config.g.dart';
 
 part 'generated/clash_config.freezed.dart';
 
-
 @freezed
 class Tun with _$Tun {
   const factory Tun({
     @Default(false) bool enable,
     @Default(appName) String device,
     @Default(TunStack.gvisor) TunStack stack,
-    @JsonKey(name: "dns-hijack") @Default(["any:53"])
-    List<String> dnsHijack,
+    @JsonKey(name: "dns-hijack") @Default(["any:53"]) List<String> dnsHijack,
   }) = _Tun;
 
   factory Tun.fromJson(Map<String, Object?> json) => _$TunFromJson(json);
@@ -198,6 +196,19 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
+  update([ClashConfig? clashConfig]) {
+    if (clashConfig != null) {
+      _mixedPort = clashConfig._mixedPort;
+      _allowLan = clashConfig._allowLan;
+      _mode = clashConfig._mode;
+      _logLevel = clashConfig._logLevel;
+      _tun = clashConfig._tun;
+      _dns = clashConfig._dns;
+      _rules = clashConfig._rules;
+    }
+    notifyListeners();
+  }
+
   Map<String, dynamic> toJson() {
     return _$ClashConfigToJson(this);
   }
@@ -216,4 +227,9 @@ class ClashConfig extends ChangeNotifier {
       allowLan: allowLan,
     );
   }
-}
+
+  @override
+  String toString() {
+    return 'ClashConfig{_mixedPort: $_mixedPort, _allowLan: $_allowLan, _mode: $_mode, _logLevel: $_logLevel, _tun: $_tun, _dns: $_dns, _rules: $_rules}';
+  }
+}

lib/models/common.dart

@@ -1,28 +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}';
-  }
-}

lib/models/config.dart

@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:json_annotation/json_annotation.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 
 import '../enum/enum.dart';
 import '../common/common.dart';
@@ -9,53 +9,19 @@ import 'models.dart';
 
 part 'generated/config.g.dart';
 
-@JsonSerializable()
-class AccessControl {
-  AccessControlMode mode;
-  List<String> acceptList;
-  List<String> rejectList;
-  bool isFilterSystemApp;
+part 'generated/config.freezed.dart';
 
-  AccessControl({
-    this.isFilterSystemApp = true,
-    this.mode = AccessControlMode.rejectSelected,
-    this.acceptList = const [],
-    this.rejectList = const [],
-  });
+@freezed
+class AccessControl with _$AccessControl {
+  const factory AccessControl({
+    @Default(AccessControlMode.rejectSelected) AccessControlMode mode,
+    @Default([]) List<String> acceptList,
+    @Default([]) List<String> rejectList,
+    @Default(true) bool isFilterSystemApp,
+  }) = _AccessControl;
 
-  @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);
-  }
+  factory AccessControl.fromJson(Map<String, Object?> json) =>
+      _$AccessControlFromJson(json);
 }
 
 @JsonSerializable()
@@ -75,6 +41,8 @@ class Config extends ChangeNotifier {
   bool _isAccessControl;
   AccessControl _accessControl;
   bool _isAnimateToPage;
+  bool _autoCheckUpdate;
+  DAV? _dav;
 
   Config()
       : _profiles = [],
@@ -83,12 +51,13 @@ class Config extends ChangeNotifier {
         _autoRun = false,
         _themeMode = ThemeMode.system,
         _openLog = false,
-        _isCompatible = false,
-        _primaryColor = appConstant.defaultPrimaryColor.value,
+        _isCompatible = true,
+        _primaryColor = defaultPrimaryColor.value,
         _proxiesSortType = ProxiesSortType.none,
         _isMinimizeOnExit = true,
         _isAccessControl = false,
-        _accessControl = AccessControl(),
+        _autoCheckUpdate = true,
+        _accessControl = const AccessControl(),
         _isAnimateToPage = true;
 
   deleteProfileById(String id) {
@@ -108,17 +77,18 @@ class Config extends ChangeNotifier {
   }
 
   String? _getLabel(String? label, String id) {
+    final realLabel = label ?? id;
     final hasDup = _profiles.indexWhere(
-            (element) => element.label == label && element.id != id) !=
+            (element) => element.label == realLabel && element.id != id) !=
         -1;
     if (hasDup) {
-      return _getLabel(other.getOverwriteLabel(label!), id);
+      return _getLabel(other.getOverwriteLabel(realLabel), id);
     } else {
       return label;
     }
   }
 
-  setProfile(Profile profile) {
+  _setProfile(Profile profile) {
     final List<Profile> profilesTemp = List.from(_profiles);
     final index =
         profilesTemp.indexWhere((element) => element.id == profile.id);
@@ -131,6 +101,10 @@ class Config extends ChangeNotifier {
       profilesTemp[index] = updateProfile;
     }
     _profiles = profilesTemp;
+  }
+
+  setProfile(Profile profile) {
+    _setProfile(profile);
     notifyListeners();
   }
 
@@ -161,7 +135,6 @@ class Config extends ChangeNotifier {
     }
   }
 
-
   SelectedMap get currentSelectedMap {
     return currentProfile?.selectedMap ?? {};
   }
@@ -280,9 +253,18 @@ class Config extends ChangeNotifier {
 
   AccessControl get accessControl => _accessControl;
 
-  set accessControl(AccessControl? value) {
+  set accessControl(AccessControl value) {
     if (_accessControl != value) {
-      _accessControl = value ?? AccessControl();
+      _accessControl = value;
+      notifyListeners();
+    }
+  }
+
+  DAV? get dav => _dav;
+
+  set dav(DAV? value) {
+    if (_dav != value) {
+      _dav = value;
       notifyListeners();
     }
   }
@@ -300,7 +282,7 @@ class Config extends ChangeNotifier {
     }
   }
 
-  @JsonKey(defaultValue: false)
+  @JsonKey(defaultValue: true)
   bool get isCompatible {
     return _isCompatible;
   }
@@ -312,7 +294,47 @@ class Config extends ChangeNotifier {
     }
   }
 
-  update() {
+  @JsonKey(defaultValue: true)
+  bool get autoCheckUpdate {
+    return _autoCheckUpdate;
+  }
+
+  set autoCheckUpdate(bool value) {
+    if (_autoCheckUpdate != value) {
+      _autoCheckUpdate = value;
+      notifyListeners();
+    }
+  }
+
+  update(
+      [Config? config, RecoveryOption recoveryOptions = RecoveryOption.all]) {
+    if (config != null) {
+      _profiles = config._profiles;
+      for (final profile in config._profiles) {
+        _setProfile(profile);
+      }
+      final onlyProfiles = recoveryOptions == RecoveryOption.onlyProfiles;
+      if (_currentProfileId == null && onlyProfiles && profiles.isNotEmpty) {
+        _currentProfileId = _profiles.first.id;
+      }
+      if (onlyProfiles) return;
+      _currentProfileId = config._currentProfileId;
+      _isCompatible = config._isCompatible;
+      _autoLaunch = config._autoLaunch;
+      _silentLaunch = config._silentLaunch;
+      _autoRun = config._autoRun;
+      _openLog = config._openLog;
+      _themeMode = config._themeMode;
+      _locale = config._locale;
+      _primaryColor = config._primaryColor;
+      _proxiesSortType = config._proxiesSortType;
+      _isMinimizeOnExit = config._isMinimizeOnExit;
+      _isAccessControl = config._isAccessControl;
+      _accessControl = config._accessControl;
+      _isAnimateToPage = config._isAnimateToPage;
+      _autoCheckUpdate = config._autoCheckUpdate;
+      _dav = config._dav;
+    }
     notifyListeners();
   }
 
@@ -323,4 +345,9 @@ class Config extends ChangeNotifier {
   factory Config.fromJson(Map<String, dynamic> json) {
     return _$ConfigFromJson(json);
   }
+
+  @override
+  String toString() {
+    return 'Config{_profiles: $_profiles, _isCompatible: $_isCompatible, _currentProfileId: $_currentProfileId, _autoLaunch: $_autoLaunch, _silentLaunch: $_silentLaunch, _autoRun: $_autoRun, _openLog: $_openLog, _themeMode: $_themeMode, _locale: $_locale, _primaryColor: $_primaryColor, _proxiesSortType: $_proxiesSortType, _isMinimizeOnExit: $_isMinimizeOnExit, _isAccessControl: $_isAccessControl, _accessControl: $_accessControl, _isAnimateToPage: $_isAnimateToPage, _dav: $_dav}';
+  }
 }

lib/models/dav.dart

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

lib/models/ffi.dart

@@ -75,3 +75,16 @@ class Process with _$Process {
   factory Process.fromJson(Map<String, Object?> 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);
+}

lib/models/generated/config.freezed.dart

@@ -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;
+}

lib/models/generated/config.g.dart

@@ -6,34 +6,6 @@ part of '../config.dart';
 // 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()
   ..profiles = (json['profiles'] as List<dynamic>?)
           ?.map((e) => Profile.fromJson(e as Map<String, dynamic>))
@@ -55,8 +27,12 @@ Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
   ..isAccessControl = json['isAccessControl'] as bool? ?? false
   ..accessControl =
       AccessControl.fromJson(json['accessControl'] as Map<String, dynamic>)
+  ..dav = json['dav'] == null
+      ? null
+      : DAV.fromJson(json['dav'] as Map<String, dynamic>)
   ..isAnimateToPage = json['isAnimateToPage'] as bool? ?? true
-  ..isCompatible = json['isCompatible'] as bool? ?? false;
+  ..isCompatible = json['isCompatible'] as bool? ?? true
+  ..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true;
 
 Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
       'profiles': instance.profiles,
@@ -72,8 +48,10 @@ Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
       'isMinimizeOnExit': instance.isMinimizeOnExit,
       'isAccessControl': instance.isAccessControl,
       'accessControl': instance.accessControl,
+      'dav': instance.dav,
       'isAnimateToPage': instance.isAnimateToPage,
       'isCompatible': instance.isCompatible,
+      'autoCheckUpdate': instance.autoCheckUpdate,
     };
 
 const _$ThemeModeEnumMap = {
@@ -87,3 +65,31 @@ const _$ProxiesSortTypeEnumMap = {
   ProxiesSortType.delay: 'delay',
   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',
+};

lib/models/generated/dav.freezed.dart

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

lib/models/generated/dav.g.dart

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

lib/models/generated/ffi.freezed.dart

@@ -1029,3 +1029,214 @@ abstract class _Process implements Process {
   _$$ProcessImplCopyWith<_$ProcessImpl> get copyWith =>
       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;
+}

lib/models/generated/ffi.g.dart

@@ -94,3 +94,21 @@ Map<String, dynamic> _$$ProcessImplToJson(_$ProcessImpl instance) =>
       'source': instance.source,
       '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(),
+    };

lib/models/generated/navigation.freezed.dart

@@ -20,6 +20,7 @@ mixin _$NavigationItem {
   String get label => throw _privateConstructorUsedError;
   String? get description => throw _privateConstructorUsedError;
   Widget get fragment => throw _privateConstructorUsedError;
+  bool get keep => throw _privateConstructorUsedError;
   String? get path => throw _privateConstructorUsedError;
   List<NavigationItemMode> get modes => throw _privateConstructorUsedError;
 
@@ -39,6 +40,7 @@ abstract class $NavigationItemCopyWith<$Res> {
       String label,
       String? description,
       Widget fragment,
+      bool keep,
       String? path,
       List<NavigationItemMode> modes});
 }
@@ -60,6 +62,7 @@ class _$NavigationItemCopyWithImpl<$Res, $Val extends NavigationItem>
     Object? label = null,
     Object? description = freezed,
     Object? fragment = null,
+    Object? keep = null,
     Object? path = freezed,
     Object? modes = null,
   }) {
@@ -80,6 +83,10 @@ class _$NavigationItemCopyWithImpl<$Res, $Val extends NavigationItem>
           ? _value.fragment
           : fragment // ignore: cast_nullable_to_non_nullable
               as Widget,
+      keep: null == keep
+          ? _value.keep
+          : keep // ignore: cast_nullable_to_non_nullable
+              as bool,
       path: freezed == path
           ? _value.path
           : path // ignore: cast_nullable_to_non_nullable
@@ -105,6 +112,7 @@ abstract class _$$NavigationItemImplCopyWith<$Res>
       String label,
       String? description,
       Widget fragment,
+      bool keep,
       String? path,
       List<NavigationItemMode> modes});
 }
@@ -124,6 +132,7 @@ class __$$NavigationItemImplCopyWithImpl<$Res>
     Object? label = null,
     Object? description = freezed,
     Object? fragment = null,
+    Object? keep = null,
     Object? path = freezed,
     Object? modes = null,
   }) {
@@ -144,6 +153,10 @@ class __$$NavigationItemImplCopyWithImpl<$Res>
           ? _value.fragment
           : fragment // ignore: cast_nullable_to_non_nullable
               as Widget,
+      keep: null == keep
+          ? _value.keep
+          : keep // ignore: cast_nullable_to_non_nullable
+              as bool,
       path: freezed == path
           ? _value.path
           : path // ignore: cast_nullable_to_non_nullable
@@ -164,6 +177,7 @@ class _$NavigationItemImpl implements _NavigationItem {
       required this.label,
       this.description,
       required this.fragment,
+      this.keep = true,
       this.path,
       final List<NavigationItemMode> modes = const [
         NavigationItemMode.mobile,
@@ -180,6 +194,9 @@ class _$NavigationItemImpl implements _NavigationItem {
   @override
   final Widget fragment;
   @override
+  @JsonKey()
+  final bool keep;
+  @override
   final String? path;
   final List<NavigationItemMode> _modes;
   @override
@@ -192,7 +209,7 @@ class _$NavigationItemImpl implements _NavigationItem {
 
   @override
   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
@@ -206,13 +223,14 @@ class _$NavigationItemImpl implements _NavigationItem {
                 other.description == description) &&
             (identical(other.fragment, fragment) ||
                 other.fragment == fragment) &&
+            (identical(other.keep, keep) || other.keep == keep) &&
             (identical(other.path, path) || other.path == path) &&
             const DeepCollectionEquality().equals(other._modes, _modes));
   }
 
   @override
   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)
   @override
@@ -228,6 +246,7 @@ abstract class _NavigationItem implements NavigationItem {
       required final String label,
       final String? description,
       required final Widget fragment,
+      final bool keep,
       final String? path,
       final List<NavigationItemMode> modes}) = _$NavigationItemImpl;
 
@@ -240,6 +259,8 @@ abstract class _NavigationItem implements NavigationItem {
   @override
   Widget get fragment;
   @override
+  bool get keep;
+  @override
   String? get path;
   @override
   List<NavigationItemMode> get modes;

lib/models/generated/proxy.g.dart

@@ -28,6 +28,8 @@ const _$GroupTypeEnumMap = {
   GroupType.Selector: 'Selector',
   GroupType.URLTest: 'URLTest',
   GroupType.Fallback: 'Fallback',
+  GroupType.LoadBalance: 'LoadBalance',
+  GroupType.Relay: 'Relay',
 };
 
 _$ProxyImpl _$$ProxyImplFromJson(Map<String, dynamic> json) => _$ProxyImpl(

lib/models/ip.dart

@@ -0,0 +1,70 @@
+class IpInfo {
+  final String ip;
+  final String countryCode;
+
+  const IpInfo({
+    required this.ip,
+    required this.countryCode,
+  });
+
+  static IpInfo fromIpInfoIoJson(Map<String, dynamic> json) {
+    return switch (json) {
+      {
+        "ip": final String ip,
+        "country": final String country,
+      } =>
+        IpInfo(
+          ip: ip,
+          countryCode: country,
+        ),
+      _ => throw const FormatException("invalid json"),
+    };
+  }
+
+  static IpInfo fromIpApiCoJson(Map<String, dynamic> json) {
+    return switch (json) {
+      {
+        "ip": final String ip,
+        "country_code": final String countryCode,
+      } =>
+        IpInfo(
+          ip: ip,
+          countryCode: countryCode,
+        ),
+      _ => throw const FormatException("invalid json"),
+    };
+  }
+
+  static IpInfo fromIpSbJson(Map<String, dynamic> json) {
+    return switch (json) {
+      {
+        "ip": final String ip,
+        "country_code": final String countryCode,
+      } =>
+        IpInfo(
+          ip: ip,
+          countryCode: countryCode,
+        ),
+      _ => throw const FormatException("invalid json"),
+    };
+  }
+
+  static IpInfo fromIpwhoIsJson(Map<String, dynamic> json) {
+    return switch (json) {
+      {
+        "ip": final String ip,
+        "country_code": final String countryCode,
+      } =>
+        IpInfo(
+          ip: ip,
+          countryCode: countryCode,
+        ),
+      _ => throw const FormatException("invalid json"),
+    };
+  }
+
+  @override
+  String toString() {
+    return 'IpInfo{ip: $ip, countryCode: $countryCode}';
+  }
+}

lib/models/models.dart

@@ -9,7 +9,8 @@ export 'log.dart';
 export 'system_color_scheme.dart';
 export 'connection.dart';
 export 'package.dart';
-export 'common.dart';
 export 'ffi.dart';
 export 'selector.dart';
-export 'navigation.dart';
+export 'navigation.dart';
+export 'dav.dart';
+export 'ip.dart';

lib/models/navigation.dart

@@ -11,6 +11,7 @@ class NavigationItem with _$NavigationItem {
     required String label,
     final String? description,
     required Widget fragment,
+    @Default(true) bool keep,
     String? path,
     @Default([NavigationItemMode.mobile, NavigationItemMode.desktop])
     List<NavigationItemMode> modes,

lib/models/profile.dart

@@ -5,11 +5,8 @@ import 'dart:typed_data';
 import 'package:fl_clash/clash/core.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/models.dart';
 import 'package:json_annotation/json_annotation.dart';
 
-import 'common.dart';
-
 part 'generated/profile.g.dart';
 
 typedef SelectedMap = Map<String, String>;
@@ -19,16 +16,17 @@ class UserInfo {
   int upload;
   int download;
   int total;
-  int? expire;
+  int expire;
 
   UserInfo({
     int? upload,
     int? download,
     int? total,
-    this.expire,
+    int? expire,
   })  : upload = upload ?? 0,
         download = download ?? 0,
-        total = total ?? 0;
+        total = total ?? 0,
+        expire = expire ?? 0;
 
   Map<String, dynamic> toJson() {
     return _$UserInfoToJson(this);
@@ -40,10 +38,10 @@ class UserInfo {
 
   factory UserInfo.formHString(String? info) {
     if (info == null) return UserInfo();
-    var list = info.split(";");
+    final list = info.split(";");
     Map<String, int?> map = {};
-    for (var i in list) {
-      var keyValue = i.trim().split("=");
+    for (final i in list) {
+      final keyValue = i.trim().split("=");
       map[keyValue[0]] = int.tryParse(keyValue[1]);
     }
     return UserInfo(
@@ -83,46 +81,29 @@ class Profile {
     Duration? autoUpdateDuration,
     this.autoUpdate = true,
   })  : id = id ?? DateTime.now().millisecondsSinceEpoch.toString(),
-        autoUpdateDuration =
-            autoUpdateDuration ?? appConstant.defaultUpdateDuration,
+        autoUpdateDuration = autoUpdateDuration ?? defaultUpdateDuration,
         selectedMap = selectedMap ?? {};
 
-  ProfileType get type => url == null ? ProfileType.file : ProfileType.url;
+  ProfileType get type =>
+      url == null || url?.isEmpty == true ? ProfileType.file : ProfileType.url;
 
-  Future<Result<bool>> update() async {
-    if (url == null) {
-      return Result.error(
-        message: appLocalizations.unableToUpdateCurrentProfileDesc,
-      );
+  Future<void> checkAndUpdate() async {
+    final isExists = await check();
+    if (!isExists) {
+      if (url != null) {
+        return await update();
+      }
     }
-    final responseResult = await Request.getFileResponseForUrl(url!);
-    final response = responseResult.data;
-    if (responseResult.type != ResultType.success || response == null) {
-      return Result.error(message: responseResult.message);
-    }
-    final disposition = response.headers['content-disposition'];
-    if (disposition != null && label == null) {
-      final parseValue = HeaderValue.parse(disposition);
-      parseValue.parameters.forEach(
-        (key, value) {
-          if (key.startsWith("filename")) {
-            if (key == "filename*") {
-              label = Uri.decodeComponent((value ?? "").split("'").last);
-            } else {
-              label = value ?? id;
-            }
-          }
-        },
-      );
-    }
-    final userinfo = response.headers['subscription-userinfo'];
+  }
+
+  Future<void> update() async {
+    final response = await request.getFileResponseForUrl(url!);
+    final disposition = response.headers.value("content-disposition");
+    label ??= other.getFileNameForDisposition(disposition) ?? id;
+    final userinfo = response.headers.value('subscription-userinfo');
     userInfo = UserInfo.formHString(userinfo);
-    final saveResult = await saveFile(response.bodyBytes);
-    if (saveResult.type == ResultType.error) {
-      return Result.error(message: saveResult.message);
-    }
+    await saveFile(response.data);
     lastUpdateDate = DateTime.now();
-    return Result.success();
   }
 
   Future<bool> check() async {
@@ -130,10 +111,10 @@ class Profile {
     return await File(profilePath!).exists();
   }
 
-  Future<Result<void>> saveFile(Uint8List bytes) async {
-    final isValidate = clashCore.validateConfig(utf8.decode(bytes));
-    if (!isValidate) {
-      return Result.error(message: appLocalizations.profileParseErrorDesc);
+  Future<void> saveFile(Uint8List bytes) async {
+    final message = await clashCore.validateConfig(utf8.decode(bytes));
+    if (message.isNotEmpty) {
+      throw message;
     }
     final path = await appPath.getProfilePath(id);
     final file = File(path!);
@@ -143,7 +124,6 @@ class Profile {
     }
     await file.writeAsBytes(bytes);
     lastUpdateDate = DateTime.now();
-    return Result.success();
   }
 
   Map<String, dynamic> toJson() {

lib/models/selector.dart

@@ -1,11 +1,7 @@
 import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/models.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'config.dart';
-import 'navigation.dart';
-import 'package.dart';
-import 'profile.dart';
-import 'proxy.dart';
 
 part 'generated/selector.freezed.dart';
 
@@ -18,13 +14,12 @@ class StartButtonSelectorState with _$StartButtonSelectorState {
 }
 
 @freezed
-class UpdateCurrentDelaySelectorState with _$UpdateCurrentDelaySelectorState {
-  const factory UpdateCurrentDelaySelectorState({
-    required String? currentProxyName,
-    required bool isCurrent,
-    required int? delay,
+class CheckIpSelectorState with _$CheckIpSelectorState {
+  const factory CheckIpSelectorState({
     required bool isInit,
-  }) = _UpdateCurrentDelaySelectorState;
+    required bool isStart,
+    required SelectedMap selectedMap,
+  }) = _CheckIpSelectorState;
 }
 
 @freezed
@@ -40,17 +35,10 @@ class ProfilesSelectorState with _$ProfilesSelectorState {
   const factory ProfilesSelectorState({
     required List<Profile> profiles,
     required String? currentProfileId,
+    required ViewMode viewMode,
   }) = _ProfilesSelectorState;
 }
 
-@freezed
-class PackageListSelectorState with _$PackageListSelectorState {
-  const factory PackageListSelectorState({
-    required AccessControl accessControl,
-    required List<Package> packages,
-  }) = _PackageListSelectorState;
-}
-
 @freezed
 class ApplicationSelectorState with _$ApplicationSelectorState {
   const factory ApplicationSelectorState({
@@ -61,25 +49,17 @@ class ApplicationSelectorState with _$ApplicationSelectorState {
 }
 
 @freezed
-class HomeLayoutSelectorState with _$HomeLayoutSelectorState{
-  const factory HomeLayoutSelectorState({
-    required List<NavigationItem> navigationItems,
-    required int currentIndex,
-  })=_HomeLayoutSelectorState;
-}
-
-@freezed
-class TrayContainerSelectorState with _$TrayContainerSelectorState{
+class TrayContainerSelectorState with _$TrayContainerSelectorState {
   const factory TrayContainerSelectorState({
     required Mode mode,
     required bool autoLaunch,
     required bool isRun,
     required String? locale,
-  })=_TrayContainerSelectorState;
+  }) = _TrayContainerSelectorState;
 }
 
 @freezed
-class UpdateNavigationsSelector with _$UpdateNavigationsSelector{
+class UpdateNavigationsSelector with _$UpdateNavigationsSelector {
   const factory UpdateNavigationsSelector({
     required bool openLogs,
     required bool hasProxies,
@@ -87,40 +67,57 @@ class UpdateNavigationsSelector with _$UpdateNavigationsSelector{
 }
 
 @freezed
-class HomeCommonScaffoldSelectorState with _$HomeCommonScaffoldSelectorState {
-  const factory HomeCommonScaffoldSelectorState({
+class HomeSelectorState with _$HomeSelectorState {
+  const factory HomeSelectorState({
     required String currentLabel,
+    required List<NavigationItem> navigationItems,
+    required ViewMode viewMode,
     required String? locale,
-  }) = _HomeCommonScaffoldSelectorState;
+  }) = _HomeSelectorState;
 }
 
 @freezed
-class HomeNavigationSelectorState with _$HomeNavigationSelectorState{
-  const factory HomeNavigationSelectorState({
-    required int currentIndex,
-    required String? locale,
-  }) = _HomeNavigationSelectorState;
+class HomeBodySelectorState with _$HomeBodySelectorState {
+  const factory HomeBodySelectorState({
+    required List<NavigationItem> navigationItems,
+  }) = _HomeBodySelectorState;
 }
 
 @freezed
-class ProxiesCardSelectorState with _$ProxiesCardSelectorState{
+class ProxiesCardSelectorState with _$ProxiesCardSelectorState {
   const factory ProxiesCardSelectorState({
     required bool isSelected,
   }) = _ProxiesCardSelectorState;
 }
 
 @freezed
-class ProxiesSelectorState with _$ProxiesSelectorState{
+class ProxiesSelectorState with _$ProxiesSelectorState {
   const factory ProxiesSelectorState({
     required List<String> groupNames,
   }) = _ProxiesSelectorState;
 }
 
 @freezed
-class ProxiesTabViewSelectorState with _$ProxiesTabViewSelectorState{
+class ProxiesTabViewSelectorState with _$ProxiesTabViewSelectorState {
   const factory ProxiesTabViewSelectorState({
     required ProxiesSortType proxiesSortType,
     required num sortNum,
     required Group group,
+    required ViewMode viewMode,
   }) = _ProxiesTabViewSelectorState;
 }
+
+@freezed
+class MoreToolsSelectorState with _$MoreToolsSelectorState {
+  const factory MoreToolsSelectorState({
+    required List<NavigationItem> navigationItems,
+  }) = _MoreToolsSelectorState;
+}
+
+@freezed
+class PackageListSelectorState with _$PackageListSelectorState {
+  const factory PackageListSelectorState({
+    required AccessControl accessControl,
+    required bool isAccessControl,
+  }) = _PackageListSelectorState;
+}

lib/models/system_color_scheme.dart

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

lib/pages/home.dart

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

lib/pages/scan.dart

@@ -83,8 +83,8 @@ class _ScanPageState extends State<ScanPage> with WidgetsBindingObserver {
             automaticallyImplyLeading: false,
             leading: IconButton(
               style: const ButtonStyle(
-                iconSize: MaterialStatePropertyAll(32),
-                foregroundColor: MaterialStatePropertyAll(Colors.white),
+                iconSize: WidgetStatePropertyAll(32),
+                foregroundColor: WidgetStatePropertyAll(Colors.white),
               ),
               onPressed: () {
                 Navigator.of(context).pop();
@@ -92,44 +92,54 @@ class _ScanPageState extends State<ScanPage> with WidgetsBindingObserver {
               icon: const Icon(Icons.close),
             ),
             actions: [
-              IconButton(
-                onPressed: globalState.appController.addProfileFormQrCode,
-                icon: const Icon(Icons.add_photo_alternate_outlined),
+              ValueListenableBuilder<MobileScannerState>(
+                valueListenable: controller,
+                builder: (context, state, _) {
+                  var icon = const Icon(Icons.flash_off);
+                  var backgroundColor = Colors.black12;
+                  switch (state.torchState) {
+                    case TorchState.off:
+                      icon = const Icon(Icons.flash_off);
+                      backgroundColor = Colors.black12;
+                    case TorchState.on:
+                      icon = const Icon(Icons.flash_on);
+                      backgroundColor = Colors.orange;
+                    case TorchState.unavailable:
+                      icon = const Icon(Icons.flash_off);
+                      backgroundColor = Colors.transparent;
+                  }
+                  return Container(
+                    margin: const EdgeInsets.symmetric(horizontal: 8),
+                    child: AbsorbPointer(
+                      absorbing: state.torchState == TorchState.unavailable,
+                      child: IconButton(
+                        color: Colors.white,
+                        icon: icon,
+                        style: ButtonStyle(
+                          foregroundColor: const WidgetStatePropertyAll(Colors.white),
+                          backgroundColor: WidgetStatePropertyAll(backgroundColor),
+                        ),
+                        onPressed: () => controller.toggleTorch(),
+                      ),
+                    ),
+                  );
+                },
               )
             ],
           ),
           Container(
             margin: const EdgeInsets.only(bottom: 32),
             alignment: Alignment.bottomCenter,
-            child: ValueListenableBuilder<MobileScannerState>(
-              valueListenable: controller,
-              builder: (context, state, _) {
-                var icon = const Icon(Icons.flash_off);
-                var backgroundColor = Colors.black12;
-                switch (state.torchState) {
-                  case TorchState.off:
-                    icon = const Icon(Icons.flash_off);
-                    backgroundColor = Colors.black12;
-                  case TorchState.on:
-                    icon = const Icon(Icons.flash_on);
-                    backgroundColor = Colors.orange;
-                  case TorchState.unavailable:
-                    icon = const Icon(Icons.no_flash);
-                    backgroundColor = Colors.grey;
-                }
-                return IconButton(
-                  color: Colors.white,
-                  icon: icon,
-                  style: ButtonStyle(
-                    foregroundColor:
-                        const MaterialStatePropertyAll(Colors.white),
-                    backgroundColor: MaterialStatePropertyAll(backgroundColor),
-                  ),
-                  padding: const EdgeInsets.all(16),
-                  iconSize: 32.0,
-                  onPressed: () => controller.toggleTorch(),
-                );
-              },
+            child: IconButton(
+              color: Colors.white,
+              style: const ButtonStyle(
+                foregroundColor: WidgetStatePropertyAll(Colors.white),
+                backgroundColor: WidgetStatePropertyAll(Colors.grey),
+              ),
+              padding: const EdgeInsets.all(16),
+              iconSize: 32.0,
+              onPressed: globalState.appController.addProfileFormQrCode,
+              icon: const Icon(Icons.photo_camera_back),
             ),
           ),
         ],

lib/plugins/app.dart

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

lib/plugins/proxy.dart

@@ -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) {
     if (!isStart && fd != null) {

lib/state.dart

@@ -4,8 +4,6 @@ import 'dart:io';
 
 import 'package:animations/animations.dart';
 import 'package:fl_clash/clash/clash.dart';
-import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';
 
@@ -15,7 +13,6 @@ import 'common/common.dart';
 
 class GlobalState {
   Timer? timer;
-  Function? updateSortNumDebounce;
   Timer? groupsUpdateTimer;
   Function? updateCurrentDelayDebounce;
   PageController? pageController;
@@ -24,8 +21,6 @@ class GlobalState {
   late AppController appController;
   GlobalKey<CommonScaffoldState> homeScaffoldKey = GlobalKey();
   List<Function> updateFunctionLists = [];
-  List<NavigationItem> currentNavigationItems = [];
-  bool updatePackagesLock = false;
 
   startListenUpdate() {
     if (timer != null && timer!.isActive == true) return;
@@ -41,19 +36,21 @@ class GlobalState {
     timer?.cancel();
   }
 
-  Future<String> updateClashConfig({
+  Future<void> updateClashConfig({
     required ClashConfig clashConfig,
     required Config config,
     bool isPatch = true,
   }) async {
     final profilePath = await appPath.getProfilePath(config.currentProfileId);
+    await config.currentProfile?.checkAndUpdate();
     debugPrint("update config");
-    return clashCore.updateConfig(UpdateConfigParams(
+    final res = await clashCore.updateConfig(UpdateConfigParams(
       profilePath: profilePath,
       config: clashConfig,
       isPatch: isPatch,
       isCompatible: config.isCompatible,
     ));
+    if (res.isNotEmpty) throw res;
   }
 
   updateCoreVersionInfo(AppState appState) {
@@ -78,17 +75,16 @@ class GlobalState {
     stopListenUpdate();
   }
 
-  applyProfile({
+  Future<void> applyProfile({
     required AppState appState,
     required Config config,
     required ClashConfig clashConfig,
   }) async {
-    final res = await updateClashConfig(
+    await updateClashConfig(
       clashConfig: clashConfig,
       config: config,
       isPatch: false,
     );
-    if (res.isNotEmpty) return Result.error(message: res);
     await updateGroups(appState);
     changeProxy(
       appState: appState,
@@ -123,28 +119,18 @@ class GlobalState {
     required Config config,
     required ClashConfig clashConfig,
   }) {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (config.profiles.isEmpty) {
-        stopSystemProxy();
-        return;
-      }
-      config.currentSelectedMap.forEach((key, value) {
-        clashCore.changeProxy(
-          ChangeProxyParams(
-            groupName: key,
-            proxyName: value,
-          ),
-        );
-      });
-    });
-  }
-
-  updatePackages(AppState appState) async {
-    if (appState.packages.isEmpty && updatePackagesLock == false) {
-      updatePackagesLock = true;
-      appState.packages = await app?.getPackages() ?? [];
-      updatePackagesLock = false;
+    if (config.profiles.isEmpty) {
+      stopSystemProxy();
+      return;
     }
+    config.currentSelectedMap.forEach((key, value) {
+      clashCore.changeProxy(
+        ChangeProxyParams(
+          groupName: key,
+          proxyName: value,
+        ),
+      );
+    });
   }
 
   updateNavigationItems({
@@ -168,18 +154,24 @@ class GlobalState {
     required String title,
     required InlineSpan message,
     Function()? onTab,
+    String? confirmText,
   }) {
     showCommonDialog(
       child: Builder(
         builder: (context) {
           return AlertDialog(
             title: Text(title),
-            content: SizedBox(
+            content: Container(
               width: 300,
-              child: RichText(
-                text: TextSpan(
+              constraints: const BoxConstraints(maxHeight: 200),
+              child: SingleChildScrollView(
+                child: RichText(
+                  overflow: TextOverflow.visible,
+                  text: TextSpan(
                     style: Theme.of(context).textTheme.labelLarge,
-                    children: [message]),
+                    children: [message],
+                  ),
+                ),
               ),
             ),
             actions: [
@@ -188,7 +180,7 @@ class GlobalState {
                     () {
                       Navigator.of(context).pop();
                     },
-                child: Text(appLocalizations.confirm),
+                child: Text(confirmText ?? appLocalizations.confirm),
               )
             ],
           );
@@ -197,7 +189,7 @@ class GlobalState {
     );
   }
 
-  showCommonDialog<T>({
+  Future<T?> showCommonDialog<T>({
     required Widget child,
   }) async {
     return await showModal<T>(
@@ -206,23 +198,10 @@ class GlobalState {
         barrierColor: Colors.black38,
       ),
       builder: (_) => child,
-      filter: appConstant.filter,
+      filter: filter,
     );
   }
 
-  checkUpdate(Function()? onTab) async {
-    final result = await Request.checkForUpdate();
-    if (result.type == ResultType.success) {
-      showMessage(
-        title: appLocalizations.discovery,
-        message: TextSpan(
-          text: result.data,
-        ),
-        onTab: onTab,
-      );
-    }
-  }
-
   updateTraffic({
     AppState? appState,
     required Config config,
@@ -272,20 +251,23 @@ class GlobalState {
     );
   }
 
-  void updateCurrentDelay(
-      String? proxyName,
-      ) {
-    updateCurrentDelayDebounce ??= debounce<Function(String?)>((proxyName) {
-      if (proxyName != null) {
-        debugPrint("[delay]=====> $proxyName");
-        clashCore.delay(
-          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();

lib/widgets/android_container.dart

@@ -16,6 +16,7 @@ class AndroidContainer extends StatefulWidget {
 
 class _AndroidContainerState extends State<AndroidContainer>
     with WidgetsBindingObserver {
+
   @override
   void initState() {
     super.initState();

lib/widgets/card.dart

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

lib/widgets/extend_page.dart

@@ -1,6 +1,10 @@
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'side_sheet.dart';
 
 showExtendPage(
@@ -19,9 +23,11 @@ showExtendPage(
   navigator.push(
     ModalSideSheetRoute(
       modalBarrierColor: Colors.black38,
-      builder: (context) => LayoutBuilder(
-        builder: (_, __) {
-          final isMobile = context.isMobile;
+      builder: (context) => Selector<AppState, double>(
+        selector: (_, appState) => appState.viewWidth,
+        builder: (_, viewWidth, __) {
+          final isMobile =
+              globalState.appController.appState.viewMode == ViewMode.mobile;
           final commonScaffold = CommonScaffold(
             automaticallyImplyLeading: isMobile ? true : false,
             actions: isMobile
@@ -33,18 +39,18 @@ showExtendPage(
                       child: CloseButton(),
                     ),
                   ],
-            title: Text(title),
+            title: title,
             body: uniqueBody,
           );
           return AnimatedContainer(
             duration: kThemeAnimationDuration,
-            width: isMobile ? context.width : extendPageWidth ?? 300,
+            width: isMobile ? viewWidth : extendPageWidth ?? 300,
             child: commonScaffold,
           );
         },
       ),
       constraints: const BoxConstraints(),
-      filter: appConstant.filter,
+      filter: filter,
     ),
   );
 }

lib/widgets/keep_container.dart

@@ -2,8 +2,13 @@ import 'package:flutter/material.dart';
 
 class KeepContainer extends StatefulWidget {
   final Widget child;
+  final bool keep;
 
-  const KeepContainer({super.key, required this.child});
+  const KeepContainer({
+    super.key,
+    required this.child,
+    this.keep = true,
+  });
 
   @override
   State<KeepContainer> createState() => _KeepContainerState();
@@ -11,7 +16,6 @@ class KeepContainer extends StatefulWidget {
 
 class _KeepContainerState extends State<KeepContainer>
     with AutomaticKeepAliveClientMixin {
-
   @override
   Widget build(BuildContext context) {
     super.build(context);
@@ -19,5 +23,5 @@ class _KeepContainerState extends State<KeepContainer>
   }
 
   @override
-  bool get wantKeepAlive => true;
+  bool get wantKeepAlive => widget.keep;
 }

lib/widgets/list.dart

@@ -1,4 +1,5 @@
-import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/open_container.dart';
 import 'package:flutter/material.dart';
 
@@ -56,10 +57,12 @@ class OpenDelegate extends Delegate {
 class NextDelegate extends Delegate {
   final Widget widget;
   final String title;
+  final double? extendPageWidth;
 
   const NextDelegate({
     required this.title,
     required this.widget,
+    this.extendPageWidth,
   });
 }
 
@@ -68,6 +71,7 @@ class ListItem<T> extends StatelessWidget {
   final Widget title;
   final Widget? subtitle;
   final EdgeInsets padding;
+  final ListTileTitleAlignment tileTitleAlignment;
   final bool? prue;
   final Widget? trailing;
   final Delegate delegate;
@@ -84,6 +88,7 @@ class ListItem<T> extends StatelessWidget {
     this.horizontalTitleGap,
     this.prue,
     this.onTab,
+    this.tileTitleAlignment = ListTileTitleAlignment.center,
   }) : delegate = const Delegate();
 
   const ListItem.open({
@@ -96,6 +101,7 @@ class ListItem<T> extends StatelessWidget {
     required OpenDelegate this.delegate,
     this.horizontalTitleGap,
     this.prue,
+    this.tileTitleAlignment = ListTileTitleAlignment.center,
   }) : onTab = null;
 
   const ListItem.next({
@@ -108,6 +114,7 @@ class ListItem<T> extends StatelessWidget {
     required NextDelegate this.delegate,
     this.horizontalTitleGap,
     this.prue,
+    this.tileTitleAlignment = ListTileTitleAlignment.center,
   }) : onTab = null;
 
   const ListItem.checkbox({
@@ -119,6 +126,7 @@ class ListItem<T> extends StatelessWidget {
     required CheckboxDelegate this.delegate,
     this.horizontalTitleGap,
     this.prue,
+    this.tileTitleAlignment = ListTileTitleAlignment.center,
   })  : trailing = null,
         onTab = null;
 
@@ -131,6 +139,7 @@ class ListItem<T> extends StatelessWidget {
     required SwitchDelegate this.delegate,
     this.horizontalTitleGap,
     this.prue,
+    this.tileTitleAlignment = ListTileTitleAlignment.center,
   })  : trailing = null,
         onTab = null;
 
@@ -143,6 +152,7 @@ class ListItem<T> extends StatelessWidget {
     required RadioDelegate<T> this.delegate,
     this.horizontalTitleGap = 8,
     this.prue,
+    this.tileTitleAlignment = ListTileTitleAlignment.center,
   })  : leading = null,
         onTab = null;
 
@@ -190,6 +200,7 @@ class ListItem<T> extends StatelessWidget {
       horizontalTitleGap: horizontalTitleGap,
       title: title,
       subtitle: subtitle,
+      titleAlignment: tileTitleAlignment,
       onTap: onTab,
       trailing: trailing ?? this.trailing,
       contentPadding: padding,
@@ -203,7 +214,7 @@ class ListItem<T> extends StatelessWidget {
       return OpenContainer(
         closedBuilder: (_, action) {
           openAction() {
-            final isMobile = context.isMobile;
+            final isMobile = globalState.appController.appState.viewMode == ViewMode.mobile;
             if (!isMobile) {
               showExtendPage(
                 context,
@@ -220,8 +231,9 @@ class ListItem<T> extends StatelessWidget {
         },
         openBuilder: (_, action) {
           return CommonScaffold.open(
+            key: Key(openDelegate.title),
             onBack: action,
-            title: Text(openDelegate.title),
+            title: openDelegate.title,
             body: openDelegate.widget,
           );
         },
@@ -231,11 +243,22 @@ class ListItem<T> extends StatelessWidget {
       final nextDelegate = delegate as NextDelegate;
       return _buildListTile(
         onTab: () {
+          final isMobile = globalState.appController.appState.viewMode == ViewMode.mobile;
+          if (!isMobile) {
+            showExtendPage(
+              context,
+              body: nextDelegate.widget,
+              title: nextDelegate.title,
+              extendPageWidth: nextDelegate.extendPageWidth,
+            );
+            return;
+          }
           Navigator.of(context).push(
             MaterialPageRoute(
               builder: (context) => CommonScaffold(
+                key: Key(nextDelegate.title),
                 body: nextDelegate.widget,
-                title: Text(nextDelegate.title),
+                title: nextDelegate.title,
               ),
             ),
           );

lib/widgets/open_container.dart

@@ -448,8 +448,8 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
       builder: (_, __, ___) {
         _colorTween = _getColorTween(
           transitionType: transitionType,
-          closedColor: Theme.of(context).colorScheme.background,
-          openColor: Theme.of(context).colorScheme.background,
+          closedColor: Theme.of(context).colorScheme.surface,
+          openColor: Theme.of(context).colorScheme.surface,
           middleColor: middleColor,
         );
         return Align(