Update version

Add lightBlue theme color

Fix start unable to update profile issues

.github/workflows/build.yml

@@ -21,6 +21,12 @@ jobs:
             os: macos-13
 
     steps:
+      - name: Check Matrix
+        run: |
+            echo "Running on ${{ matrix.os }}"
+            echo "Arch: ${{ runner.arch }}"
+            gcc --version
+
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -82,6 +88,7 @@ jobs:
 
 
   upload-release:
+    if: ${{ !contains(github.ref, '+') }}
     permissions: write-all
     needs: [ build ]
     runs-on: ubuntu-latest
@@ -89,7 +96,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          submodules: recursive
+          fetch-depth: 0
 
       - name: Download
         uses: actions/download-artifact@v4
@@ -101,13 +108,13 @@ jobs:
       - name: Pre Release
         run: |
           pip install gitchangelog pystache mustache markdown
-          prelease=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
+          pre=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
-          if [ -z "$prelease" ]; then
+          if [ -z "pre" ]; then
             echo "init" > release.md
           else
             current="${{ github.ref_name }}"
             echo -e "\n\n<details markdown=1><summary>All changes from $current to the latest commit:</summary>\n\n" >> release.md
-            gitchangelog "${prelease}" >> release.md 2>&1 || echo "Error in gitchangelog"
+            gitchangelog "${pre}.." >> release.md 2>&1 || echo "Error in gitchangelog"
             echo -e "\n\n</details>" >> release.md
           fi
       - name: Release

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

.gitmodules

@@ -5,4 +5,4 @@
 [submodule "plugins/flutter_distributor"]
 	path = plugins/flutter_distributor
 	url = git@github.com:chen08209/flutter_distributor.git
-	branch = main
+	branch = FlClash

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.FOREGROUND_SERVICE_SPECIAL_USE"
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission"/>
+        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/GlobalState.kt

@@ -1,6 +1,7 @@
 package com.follow.clash
 
 import androidx.lifecycle.MutableLiveData
+import com.follow.clash.plugins.AppPlugin
 import com.follow.clash.plugins.TilePlugin
 import io.flutter.embedding.engine.FlutterEngine
 import java.util.Date
@@ -18,6 +19,9 @@ class GlobalState {
         var flutterEngine: FlutterEngine? = null
         fun getCurrentTilePlugin(): TilePlugin? =
             flutterEngine?.plugins?.get(TilePlugin::class.java) as TilePlugin?
+
+        fun getCurrentAppPlugin(): AppPlugin? =
+            flutterEngine?.plugins?.get(AppPlugin::class.java) as AppPlugin?
     }
 }
 

android/app/src/main/kotlin/com/follow/clash/extensions/Drawable.kt

@@ -1,17 +1,18 @@
 package com.follow.clash.extensions
 
-import java.net.InetSocketAddress
-
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.system.OsConstants.IPPROTO_TCP
 import android.system.OsConstants.IPPROTO_UDP
 import android.util.Base64
+import java.net.URL
 import androidx.core.graphics.drawable.toBitmap
 import com.follow.clash.models.Metadata
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.ByteArrayOutputStream
+import java.net.InetAddress
+import java.net.InetSocketAddress
 
 
 suspend fun Drawable.getBase64(): String {
@@ -29,3 +30,8 @@ fun Metadata.getProtocol(): Int? {
     if (network.startsWith("udp")) return IPPROTO_UDP
     return null
 }
+
+fun String.getInetSocketAddress(): InetSocketAddress {
+    val url = URL("https://$this")
+    return InetSocketAddress(InetAddress.getByName(url.host), url.port)
+}

android/app/src/main/kotlin/com/follow/clash/models/Process.kt

@@ -1,11 +1,15 @@
 package com.follow.clash.models
 
+data class Process(
+    val id: Int,
+    val metadata: Metadata,
+)
+
 data class Metadata(
     val network: String,
     val sourceIP: String,
     val sourcePort: Int,
     val destinationIP: String,
     val destinationPort: Int,
-    val remoteDestination: String,
     val host: String
 )

android/app/src/main/kotlin/com/follow/clash/models/Props.kt

@@ -10,3 +10,9 @@ data class AccessControl(
     val acceptList: List<String>,
     val rejectList: List<String>,
 )
+
+data class Props(
+    val accessControl: AccessControl?,
+    val allowBypass: Boolean?,
+    val systemProxy: Boolean?,
+)

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

@@ -6,13 +6,16 @@ import android.content.Context
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.net.ConnectivityManager
+import android.net.Uri
 import android.os.Build
 import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.core.content.getSystemService
+import androidx.core.graphics.drawable.toBitmap
 import com.follow.clash.extensions.getBase64
+import com.follow.clash.extensions.getInetSocketAddress
 import com.follow.clash.extensions.getProtocol
-import com.follow.clash.models.Metadata
+import com.follow.clash.models.Process
 import com.follow.clash.models.Package
 import com.google.gson.Gson
 import io.flutter.embedding.engine.plugins.FlutterPlugin
@@ -52,6 +55,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()
@@ -77,21 +81,34 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
             "getPackageIcon" -> {
                 scope.launch {
                     val packageName = call.argument<String>("packageName")
-                    if (packageName != null) {
+                    if (packageName == null) {
-                        result.success(getPackageIcon(packageName))
-                    } else {
                         result.success(null)
+                        return@launch
+                    }
+                    val packageIcon = getPackageIcon(packageName)
+                    packageIcon.let {
+                        if (it != null) {
+                            result.success(it)
+                            return@launch
+                        }
+                        if (iconMap["default"] == null) {
+                            iconMap["default"] =
+                                context?.packageManager?.defaultActivityIcon?.getBase64()
+                        }
+                        result.success(iconMap["default"])
+                        return@launch
                     }
                 }
             }
 
-            "getPackageName" -> {
+            "resolverProcess" -> {
                 val data = call.argument<String>("data")
-                val metadata =
+                val process =
                     if (data != null) Gson().fromJson(
                         data,
-                        Metadata::class.java
+                        Process::class.java
                     ) else null
+                val metadata = process?.metadata
                 val protocol = metadata?.getProtocol()
                 if (protocol == null) {
                     result.success(null)
@@ -99,17 +116,27 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                 }
                 scope.launch {
                     withContext(Dispatchers.Default) {
-                        if (context == null) result.success(null)
+                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q){
-                        val source = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
+                            result.success(null)
-                        val target = InetSocketAddress(
+                            return@withContext
-                            metadata.host.ifEmpty { metadata.destinationIP },
+                        }
-                            metadata.destinationPort
+                        if (context == null) {
-                        )
+                            result.success(null)
+                            return@withContext
+                        }
                         if (connectivity == null) {
                             connectivity = context!!.getSystemService<ConnectivityManager>()
                         }
-                        val uid =
+                        val src = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
-                            connectivity?.getConnectionOwnerUid(protocol, source, target)
+                        val dst = InetSocketAddress(
+                            metadata.destinationIP.ifEmpty { metadata.host },
+                            metadata.destinationPort
+                        )
+                        val uid = try {
+                            connectivity?.getConnectionOwnerUid(protocol, src, dst)
+                        } catch (_: Exception) {
+                            null
+                        }
                         if (uid == null || uid == -1) {
                             result.success(null)
                             return@withContext
@@ -136,19 +163,24 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     private suspend fun getPackageIcon(packageName: String): String? {
         val packageManager = context?.packageManager
         if (iconMap[packageName] == null) {
-            iconMap[packageName] = packageManager?.getApplicationIcon(packageName)?.getBase64()
+            iconMap[packageName] = try {
+                packageManager?.getApplicationIcon(packageName)?.getBase64()
+            } catch (_: Exception) {
+                null
+            }
+
         }
         return iconMap[packageName]
     }
 
     private suspend fun getPackages(): String {
-        return withContext(Dispatchers.Default){
+        return withContext(Dispatchers.Default) {
             val packageManager = context?.packageManager
             val packages: List<Package>? =
                 packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
-                    it.packageName == context?.packageName
+                    it.packageName != context?.packageName
-                            || it.requestedPermissions?.contains(Manifest.permission.INTERNET) == false
+                            || it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
-                            || it.packageName != "android"
+                            || it.packageName == "android"
 
                 }?.map {
                     Package(
@@ -161,6 +193,10 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         }
     }
 
+    fun requestGc() {
+        channel.invokeMethod("gc", null)
+    }
+
     override fun onAttachedToActivity(binding: ActivityPluginBinding) {
         activity = binding.activity;
         scope = CoroutineScope(Dispatchers.Default)

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

@@ -16,7 +16,7 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import com.follow.clash.GlobalState
 import com.follow.clash.RunState
-import com.follow.clash.models.AccessControl
+import com.follow.clash.models.Props
 import com.follow.clash.services.FlClashVpnService
 import com.google.gson.Gson
 import io.flutter.embedding.android.FlutterActivity
@@ -41,7 +41,7 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
     private var flClashVpnService: FlClashVpnService? = null
     private var isBound = false
     private var port: Int? = null
-    private var accessControl: AccessControl? = null
+    private var props: Props? = null
     private lateinit var title: String
     private lateinit var content: String
 
@@ -73,8 +73,8 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
         "StartProxy" -> {
             port = call.argument<Int>("port")
             val args = call.argument<String>("args")
-            accessControl =
+            props =
-                if (args != null) Gson().fromJson(args, AccessControl::class.java) else null
+                if (args != null) Gson().fromJson(args, Props::class.java) else null
             handleStartVpn()
             result.success(true)
         }
@@ -121,7 +121,7 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
 
     private fun startVpn(port: Int) {
         if (GlobalState.runState.value == RunState.START) return;
-        flClashVpnService?.start(port, accessControl)
+        flClashVpnService?.start(port, props)
         GlobalState.runState.value = RunState.START
         GlobalState.runTime = Date()
         startAfter()

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)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
-        if (Build.VERSION.SDK_INT >= 34) {
+        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
-            val pendingIntent = PendingIntent.getActivity(
+            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,11 +12,11 @@ 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.models.AccessControl
+import com.follow.clash.R
 import com.follow.clash.models.AccessControlMode
+import com.follow.clash.models.Props
 
 
 class FlClashVpnService : VpnService() {
@@ -52,12 +51,12 @@ class FlClashVpnService : VpnService() {
         return START_STICKY
     }
 
-    fun start(port: Int, accessControl: AccessControl?) {
+    fun start(port: Int, props: Props?) {
         fd = with(Builder()) {
             addAddress("172.16.0.1", 30)
             setMtu(9000)
             addRoute("0.0.0.0", 0)
-            if (accessControl != null) {
+            props?.accessControl?.let { accessControl ->
                 when (accessControl.mode) {
                     AccessControlMode.acceptSelected -> {
                         (accessControl.acceptList + packageName).forEach {
@@ -78,8 +77,10 @@ class FlClashVpnService : VpnService() {
             if (Build.VERSION.SDK_INT >= 29) {
                 setMetered(false)
             }
-            allowBypass()
+            if (props?.allowBypass == true) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                allowBypass()
+            }
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && props?.systemProxy == true) {
                 setHttpProxy(
                     ProxyInfo.buildDirectProxy(
                         "127.0.0.1",
@@ -97,55 +98,69 @@ 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);
+        }
+    }
+
+    override fun onTrimMemory(level: Int) {
+        super.onTrimMemory(level)
+        GlobalState.getCurrentAppPlugin()?.requestGc()
+    }
+
     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)
+            var channel = manager?.getNotificationChannel(CHANNEL)
-
+            if (channel == null) {
-            val intent = Intent(this, MainActivity::class.java)
+                channel =
-
+                    NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
-            val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                manager?.createNotificationChannel(channel)
-                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)
             }
         }
+        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/values-night/styles.xml

@@ -4,7 +4,6 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@mipmap/ic_launcher_foreground</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

android/app/src/main/res/values/styles.xml

@@ -4,7 +4,6 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@mipmap/ic_launcher_foreground</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

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

@@ -2,26 +2,68 @@ package main
 
 import "C"
 import (
+	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/inbound"
+	ap "github.com/metacubex/mihomo/adapter/provider"
 	"github.com/metacubex/mihomo/component/dialer"
-	"github.com/metacubex/mihomo/component/process"
 	"github.com/metacubex/mihomo/component/resolver"
 	"github.com/metacubex/mihomo/config"
-	"github.com/metacubex/mihomo/dns"
+	"github.com/metacubex/mihomo/constant"
+	"github.com/metacubex/mihomo/hub"
 	"github.com/metacubex/mihomo/hub/executor"
+	"github.com/metacubex/mihomo/hub/route"
 	"github.com/metacubex/mihomo/listener"
 	"github.com/metacubex/mihomo/log"
 	"github.com/metacubex/mihomo/tunnel"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"runtime"
+	"strings"
 	"syscall"
+	"time"
 )
 
+type healthCheckSchema struct {
+	Enable         bool   `provider:"enable"`
+	URL            string `provider:"url"`
+	Interval       int    `provider:"interval"`
+	TestTimeout    int    `provider:"timeout,omitempty"`
+	Lazy           bool   `provider:"lazy,omitempty"`
+	ExpectedStatus string `provider:"expected-status,omitempty"`
+}
+
+type proxyProviderSchema struct {
+	Type          string `provider:"type"`
+	Path          string `provider:"path,omitempty"`
+	URL           string `provider:"url,omitempty"`
+	Proxy         string `provider:"proxy,omitempty"`
+	Interval      int    `provider:"interval,omitempty"`
+	Filter        string `provider:"filter,omitempty"`
+	ExcludeFilter string `provider:"exclude-filter,omitempty"`
+	ExcludeType   string `provider:"exclude-type,omitempty"`
+	DialerProxy   string `provider:"dialer-proxy,omitempty"`
+
+	HealthCheck healthCheckSchema   `provider:"health-check,omitempty"`
+	Override    ap.OverrideSchema   `provider:"override,omitempty"`
+	Header      map[string][]string `provider:"header,omitempty"`
+}
+
+type ruleProviderSchema struct {
+	Type     string `provider:"type"`
+	Behavior string `provider:"behavior"`
+	Path     string `provider:"path,omitempty"`
+	URL      string `provider:"url,omitempty"`
+	Proxy    string `provider:"proxy,omitempty"`
+	Format   string `provider:"format,omitempty"`
+	Interval int    `provider:"interval,omitempty"`
+}
+
 type GenerateConfigParams struct {
-	ProfilePath *string           `json:"profile-path"`
+	ProfilePath  *string           `json:"profile-path"`
-	Config      *config.RawConfig `json:"config" `
+	Config       *config.RawConfig `json:"config" `
-	IsPatch     *bool             `json:"is-patch"`
+	IsPatch      *bool             `json:"is-patch"`
+	IsCompatible *bool             `json:"is-compatible"`
 }
 
 type ChangeProxyParams struct {
@@ -40,10 +82,25 @@ type Delay struct {
 }
 
 type Process struct {
-	Uid     uint32 `json:"uid"`
+	Id       int64              `json:"id"`
-	Network string `json:"network"`
+	Metadata *constant.Metadata `json:"metadata"`
-	Source  string `json:"source"`
+}
-	Target  string `json:"target"`
+
+type ProcessMapItem struct {
+	Id    int64  `json:"id"`
+	Value string `json:"value"`
+}
+
+type Now struct {
+	Name  string `json:"name"`
+	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) {
@@ -82,6 +139,19 @@ func readFile(path string) ([]byte, error) {
 	return data, err
 }
 
+func removeFile(path string) error {
+	absPath, err := filepath.Abs(path)
+	if err != nil {
+		return err
+	}
+	err = os.Remove(absPath)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func getRawConfigWithPath(path *string) *config.RawConfig {
 	if path == nil {
 		return config.DefaultRawConfig()
@@ -100,55 +170,208 @@ func getRawConfigWithPath(path *string) *config.RawConfig {
 	}
 }
 
-func decorationConfig(profilePath *string, cfg config.RawConfig) *config.RawConfig {
+func decorationConfig(profilePath *string, cfg config.RawConfig, compatible bool) *config.RawConfig {
 	prof := getRawConfigWithPath(profilePath)
-	overwriteConfig(prof, cfg)
+	overwriteConfig(prof, cfg, compatible)
 	return prof
 }
 
-func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig) {
+func Reduce[T any, U any](s []T, initVal U, f func(U, T) U) U {
-	targetConfig.ExternalController = ""
+	for _, v := range s {
+		initVal = f(initVal, v)
+	}
+	return initVal
+}
+
+func Map[T, U any](slice []T, fn func(T) U) []U {
+	result := make([]U, len(slice))
+	for i, v := range slice {
+		result[i] = fn(v)
+	}
+	return result
+}
+
+func replaceFromMap(s string, m map[string]string) string {
+	for k, v := range m {
+		s = strings.ReplaceAll(s, k, v)
+	}
+	return s
+}
+
+func removeDuplicateFromSlice[T any](slice []T) []T {
+	result := make([]T, 0)
+	seen := make(map[any]struct{})
+	for _, value := range slice {
+		if _, ok := seen[value]; !ok {
+			result = append(result, value)
+			seen[value] = struct{}{}
+		}
+	}
+	return result
+}
+
+func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
+	var replacements = map[string]string{}
+	var selectArr []map[string]any
+	var urlTestArr []map[string]any
+	var fallbackArr []map[string]any
+	for _, group := range *proxyGroup {
+		switch group["type"] {
+		case "select":
+			selectArr = append(selectArr, group)
+			replacements[group["name"].(string)] = "Proxy"
+			break
+		case "url-test":
+			urlTestArr = append(urlTestArr, group)
+			replacements[group["name"].(string)] = "Auto"
+			break
+		case "fallback":
+			fallbackArr = append(fallbackArr, group)
+			replacements[group["name"].(string)] = "Fallback"
+			break
+		default:
+			break
+		}
+	}
+
+	ProxyProxies := Reduce(selectArr, []string{}, func(res []string, cur map[string]any) []string {
+		if cur["proxies"] == nil {
+			return res
+		}
+		for _, proxyName := range cur["proxies"].([]interface{}) {
+			if str, ok := proxyName.(string); ok {
+				str = replaceFromMap(str, replacements)
+				if str != "Proxy" {
+					res = append(res, str)
+				}
+			}
+		}
+		return res
+	})
+
+	ProxyProxies = removeDuplicateFromSlice(ProxyProxies)
+
+	AutoProxies := Reduce(urlTestArr, []string{}, func(res []string, cur map[string]any) []string {
+		if cur["proxies"] == nil {
+			return res
+		}
+		for _, proxyName := range cur["proxies"].([]interface{}) {
+			if str, ok := proxyName.(string); ok {
+				str = replaceFromMap(str, replacements)
+				if str != "Auto" {
+					res = append(res, str)
+				}
+			}
+		}
+		return res
+	})
+
+	AutoProxies = removeDuplicateFromSlice(AutoProxies)
+
+	FallbackProxies := Reduce(fallbackArr, []string{}, func(res []string, cur map[string]any) []string {
+		if cur["proxies"] == nil {
+			return res
+		}
+		for _, proxyName := range cur["proxies"].([]interface{}) {
+			if str, ok := proxyName.(string); ok {
+				str = replaceFromMap(str, replacements)
+				if str != "Fallback" {
+					res = append(res, str)
+				}
+			}
+		}
+		return res
+	})
+
+	FallbackProxies = removeDuplicateFromSlice(FallbackProxies)
+
+	var computedProxyGroup []map[string]any
+
+	if len(ProxyProxies) > 0 {
+		computedProxyGroup = append(computedProxyGroup,
+			map[string]any{
+				"name":    "Proxy",
+				"type":    "select",
+				"proxies": ProxyProxies,
+			})
+	}
+
+	if len(AutoProxies) > 0 {
+		computedProxyGroup = append(computedProxyGroup,
+			map[string]any{
+				"name":    "Auto",
+				"type":    "url-test",
+				"proxies": AutoProxies,
+			})
+	}
+
+	if len(FallbackProxies) > 0 {
+		computedProxyGroup = append(computedProxyGroup,
+			map[string]any{
+				"name":    "Fallback",
+				"type":    "fallback",
+				"proxies": FallbackProxies,
+			})
+	}
+
+	computedRule := Map(*rule, func(value string) string {
+		return replaceFromMap(value, replacements)
+	})
+
+	*proxyGroup = computedProxyGroup
+	*rule = computedRule
+}
+
+func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig, compatible bool) {
+	targetConfig.ExternalController = patchConfig.ExternalController
 	targetConfig.ExternalUI = ""
 	targetConfig.Interface = ""
 	targetConfig.ExternalUIURL = ""
+	targetConfig.TCPConcurrent = patchConfig.TCPConcurrent
+	targetConfig.UnifiedDelay = patchConfig.UnifiedDelay
+	targetConfig.GeodataMode = false
 	targetConfig.IPv6 = patchConfig.IPv6
 	targetConfig.LogLevel = patchConfig.LogLevel
-	targetConfig.FindProcessMode = process.FindProcessAlways
+	targetConfig.Port = 0
-	targetConfig.AllowLan = patchConfig.AllowLan
+	targetConfig.SocksPort = 0
 	targetConfig.MixedPort = patchConfig.MixedPort
+	targetConfig.FindProcessMode = patchConfig.FindProcessMode
+	targetConfig.AllowLan = patchConfig.AllowLan
 	targetConfig.Mode = patchConfig.Mode
 	targetConfig.Tun.Enable = patchConfig.Tun.Enable
 	targetConfig.Tun.Device = patchConfig.Tun.Device
-	targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
+	//targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
-	targetConfig.Tun.Stack = patchConfig.Tun.Stack
+	//targetConfig.Tun.Stack = patchConfig.Tun.Stack
+	targetConfig.GeodataLoader = patchConfig.GeodataLoader
+	targetConfig.Profile.StoreSelected = false
 	if targetConfig.DNS.Enable == false {
 		targetConfig.DNS = patchConfig.DNS
-	} else {
+	}
-		targetConfig.DNS.UseHosts = patchConfig.DNS.UseHosts
+	//if runtime.GOOS == "android" {
-		targetConfig.DNS.EnhancedMode = patchConfig.DNS.EnhancedMode
+	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
-		targetConfig.DNS.IPv6 = patchConfig.DNS.IPv6
+	//} else if runtime.GOOS == "windows" {
-		targetConfig.DNS.DefaultNameserver = append(patchConfig.DNS.DefaultNameserver, targetConfig.DNS.DefaultNameserver...)
+	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
-		targetConfig.DNS.NameServer = append(patchConfig.DNS.NameServer, targetConfig.DNS.NameServer...)
+	//}
-		targetConfig.DNS.FakeIPFilter = append(patchConfig.DNS.FakeIPFilter, targetConfig.DNS.FakeIPFilter...)
+	if compatible == false {
-		targetConfig.DNS.Fallback = append(patchConfig.DNS.Fallback, targetConfig.DNS.Fallback...)
+		targetConfig.ProxyProvider = make(map[string]map[string]any)
-		if runtime.GOOS == "android" {
+		targetConfig.RuleProvider = make(map[string]map[string]any)
-			targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
+		generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
-		} else if runtime.GOOS == "windows" {
-			targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
-		}
 	}
 }
 
 func patchConfig(general *config.General) {
 	log.Infoln("[Apply] patch")
+	route.ReStartServer(general.ExternalController)
 	listener.SetAllowLan(general.AllowLan)
 	inbound.SetSkipAuthPrefixes(general.SkipAuthPrefixes)
 	inbound.SetAllowedIPs(general.LanAllowedIPs)
 	inbound.SetDisAllowedIPs(general.LanDisAllowedIPs)
 	listener.SetBindAddress(general.BindAddress)
 	tunnel.SetSniffing(general.Sniffing)
+	tunnel.SetFindProcessMode(general.FindProcessMode)
 	dialer.SetTcpConcurrent(general.TCPConcurrent)
 	dialer.DefaultInterface.Store(general.Interface)
+	adapter.UnifiedDelay.Store(general.UnifiedDelay)
 	listener.ReCreateHTTP(general.Port, tunnel.Tunnel)
 	listener.ReCreateSocks(general.SocksPort, tunnel.Tunnel)
 	listener.ReCreateRedir(general.RedirPort, tunnel.Tunnel)
@@ -161,13 +384,11 @@ func patchConfig(general *config.General) {
 	listener.ReCreateTuic(general.TuicServer, tunnel.Tunnel)
 	tunnel.SetMode(general.Mode)
 	log.SetLevel(general.LogLevel)
+
 	resolver.DisableIPv6 = !general.IPv6
 }
 
-func applyConfig(isPatch bool) bool {
+func applyConfig(isPatch bool) {
-	if currentConfig == nil {
-		return false
-	}
 	cfg, err := config.ParseRawConfig(currentConfig)
 	if err != nil {
 		cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
@@ -175,8 +396,6 @@ func applyConfig(isPatch bool) bool {
 	if isPatch {
 		patchConfig(cfg.General)
 	} else {
-		executor.ApplyConfig(cfg, true)
+		hub.UltraApplyConfig(cfg, true)
-
 	}
-	return true
 }

core/dart-bridge/lib.go

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

core/dart-bridge/message.go

@@ -10,7 +10,10 @@ const (
 	Log     MessageType = "log"
 	Tun     MessageType = "tun"
 	Delay   MessageType = "delay"
+	Now     MessageType = "now"
 	Process MessageType = "process"
+	Request MessageType = "request"
+	Run     MessageType = "run"
 )
 
 type Message struct {
@@ -18,11 +21,18 @@ type Message struct {
 	Data interface{} `json:"data"`
 }
 
-func (message *Message) toJson() string {
+func (message *Message) Json() (string, error) {
-	data, _ := json.Marshal(message)
+	data, err := json.Marshal(message)
-	return string(data)
+	return string(data), err
 }
 
 func SendMessage(message Message) {
-	sendToPort(*Port, message.toJson())
+	if Port == nil {
+		return
+	}
+	s, err := message.Json()
+	if err != nil {
+		return
+	}
+	SendToPort(*Port, s)
 }

core/go.mod

@@ -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
 )
 
@@ -17,11 +17,12 @@ require (
 	github.com/RyuaNerin/go-krypto v1.2.4 // indirect
 	github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect
 	github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
+	github.com/ajg/form v1.5.1 // indirect
 	github.com/andybalholm/brotli v1.0.6 // indirect
 	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
@@ -30,12 +31,15 @@ require (
 	github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
+	github.com/go-chi/chi/v5 v5.0.12 // indirect
+	github.com/go-chi/cors v1.2.1 // indirect
+	github.com/go-chi/render v1.0.3 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	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/gobwas/ws v1.4.0 // indirect
-	github.com/gofrs/uuid/v5 v5.1.0 // indirect
+	github.com/gofrs/uuid/v5 v5.2.0 // indirect
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
@@ -51,14 +55,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/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e // indirect
-	github.com/metacubex/sing-quic v0.0.0-20240418004036-814c531c378d // indirect
+	github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 // indirect
 	github.com/metacubex/sing-shadowsocks v0.2.6 // indirect
 	github.com/metacubex/sing-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 +80,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 +98,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/crypto v0.23.0 // indirect
-	golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
+	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
 	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.20.0 // indirect
+	golang.org/x/tools v0.21.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	lukechampine.com/blake3 v1.2.2 // indirect
+	lukechampine.com/blake3 v1.3.0 // indirect
 )

core/go.sum

@@ -9,6 +9,8 @@ github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 h1:cDVUiFo+npB0ZASqnw4
 github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344/go.mod h1:9pIqrY6SXNL8vjRQE5Hd/OL5GyK/9MrGUWs87z/eFfk=
 github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
 github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
+github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
+github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
 github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
@@ -21,8 +23,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.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
-github.com/cloudflare/circl v1.3.6/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
+github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
 github.com/coreos/go-iptables v0.7.0 h1:XWM3V+MPRr5/q51NuWSgU0fqMad64Zyxs8ZUoMsamr8=
 github.com/coreos/go-iptables v0.7.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -46,6 +48,12 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
 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-chi/chi/v5 v5.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s=
+github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
+github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
+github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
+github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
 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=
@@ -57,10 +65,10 @@ github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU
 github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/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.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
-github.com/gobwas/ws v1.3.2/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
+github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
-github.com/gofrs/uuid/v5 v5.1.0 h1:S5rqVKIigghZTCBKPCw0Y+bXkn26K3TB5mvQq2Ix8dk=
+github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
-github.com/gofrs/uuid/v5 v5.1.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
+github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
@@ -105,22 +113,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.43.2-0.20240518033621-2c3d14c6b38e h1:Nzwe08FNIJpExWpy9iXkG336dN/8nJqn69yijB7vJ8g=
-github.com/metacubex/quic-go v0.42.1-0.20240418003344-f006b5735d98/go.mod h1:iGx3Y1zynls/FjFgykLSqDcM81U0IKePRTXEz5g3iiQ=
+github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e/go.mod h1:uXHODgJFUfUnkkCMWLd5Er6L5QY/LFRZb9LD5jyyhsk=
-github.com/metacubex/sing-quic v0.0.0-20240418004036-814c531c378d h1:RAe0ND8J5SOPGI623oEXfaHKaaUrrzHx+U1DN9Awcco=
+github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 h1:Wr4g1HCb5Z/QIFwFiVNjO2qL+dRu25+Mdn9xtAZZ+ew=
-github.com/metacubex/sing-quic v0.0.0-20240418004036-814c531c378d/go.mod h1:WyY0zYxv+o+18R/Ece+QFontlgXoobKbNqbtYn2zjz8=
+github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
 github.com/metacubex/sing-shadowsocks v0.2.6 h1:6oEB3QcsFYnNiFeoevcXrCwJ3sAablwVSgtE9R3QeFQ=
 github.com/metacubex/sing-shadowsocks v0.2.6/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.7-0.20240512075008-89e7c6208eec h1:K4Wq3GOdLZ/xcqwyzAt4kmYQrjokyKQ3u/Xh5Yft14U=
-github.com/metacubex/sing-tun v0.2.6/go.mod h1:4VsMwZH1IlgPGFK1ZbBomZ/B2MYkTgs2+gnBAr5GOIo=
+github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec/go.mod h1:4VsMwZH1IlgPGFK1ZbBomZ/B2MYkTgs2+gnBAr5GOIo=
 github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f h1:QjXrHKbTMBip/C+R79bvbfr42xH1gZl3uFb0RELdZiQ=
 github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f/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=
@@ -166,14 +176,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.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU=
-github.com/shirou/gopsutil/v3 v3.24.3/go.mod h1:JpND7O217xa72ewWz9zN2eIIkPWsDN/3pl0H8Qt0uwg=
+github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
@@ -223,18 +231,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.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY=
+golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
-golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
+golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/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.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
@@ -254,28 +262,28 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.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/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/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.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
-golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
+golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 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.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
-lukechampine.com/blake3 v1.2.2/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
+lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=

core/hub.go

@@ -7,11 +7,16 @@ import (
 	"fmt"
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/outboundgroup"
+	"github.com/metacubex/mihomo/adapter/provider"
+	"github.com/metacubex/mihomo/common/structure"
 	"github.com/metacubex/mihomo/common/utils"
+	"github.com/metacubex/mihomo/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"
@@ -55,29 +60,81 @@ func shutdownClash() bool {
 	return true
 }
 
+//export forceGc
+func forceGc() {
+	go func() {
+		log.Infoln("[APP] request force GC")
+		runtime.GC()
+	}()
+}
+
 //export validateConfig
-func validateConfig(s *C.char) bool {
+func validateConfig(s *C.char, port C.longlong) {
-	bytes := []byte(C.GoString(s))
+	i := int64(port)
-	_, err := config.UnmarshalRawConfig(bytes)
+	go func() {
-	return err == nil
+		bytes := []byte(C.GoString(s))
+		_, err := config.UnmarshalRawConfig(bytes)
+		if err != nil {
+			bridge.SendToPort(i, err.Error())
+			return
+		}
+		bridge.SendToPort(i, "")
+	}()
 }
 
 //export updateConfig
-func updateConfig(s *C.char) bool {
+func updateConfig(s *C.char, port C.longlong) {
-	paramsString := C.GoString(s)
+	i := int64(port)
-	var params = &GenerateConfigParams{}
+	go func() {
-	err := json.Unmarshal([]byte(paramsString), params)
+		paramsString := C.GoString(s)
-	if err != nil {
+		var params = &GenerateConfigParams{}
-		log.Errorln("generateConfig Unmarshal error %v", err)
+		err := json.Unmarshal([]byte(paramsString), params)
-		return false
+		if err != nil {
-	}
+			bridge.SendToPort(i, err.Error())
-	prof := decorationConfig(params.ProfilePath, *params.Config)
+			return
-	currentConfig = prof
+		}
-	if *params.IsPatch {
+		prof := decorationConfig(params.ProfilePath, *params.Config, *params.IsCompatible)
-		return applyConfig(true)
+		currentConfig = prof
-	} else {
+		if *params.IsPatch {
-		return applyConfig(false)
+			applyConfig(true)
-	}
+		} else {
+			applyConfig(false)
+		}
+		bridge.SendToPort(i, "")
+	}()
+}
+
+//export clearEffect
+func clearEffect(s *C.char) {
+	path := C.GoString(s)
+	go func() {
+		rawCfg := getRawConfigWithPath(&path)
+		for _, mapping := range rawCfg.RuleProvider {
+			schema := &ruleProviderSchema{}
+			decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
+			if err := decoder.Decode(mapping, schema); err != nil {
+				return
+			}
+			if schema.Type == "http" {
+				_ = removeFile(constant.Path.Resolve(schema.Path))
+			}
+		}
+		for _, mapping := range rawCfg.ProxyProvider {
+			schema := &proxyProviderSchema{
+				HealthCheck: healthCheckSchema{
+					Lazy: true,
+				},
+			}
+			decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
+			if err := decoder.Decode(mapping, schema); err != nil {
+				return
+			}
+			if schema.Type == "http" {
+				_ = removeFile(constant.Path.Resolve(schema.Path))
+			}
+		}
+		_ = removeFile(path)
+	}()
 }
 
 //export getProxies
@@ -91,27 +148,28 @@ func getProxies() *C.char {
 
 //export changeProxy
 func changeProxy(s *C.char) bool {
-	paramsString := C.GoString(s)
+	go func() {
-	var params = &ChangeProxyParams{}
+		paramsString := C.GoString(s)
-	err := json.Unmarshal([]byte(paramsString), params)
+		var params = &ChangeProxyParams{}
-	if err != nil {
+		err := json.Unmarshal([]byte(paramsString), params)
-		log.Infoln("Unmarshal ChangeProxyParams %v", err)
+		if err != nil {
-		return false
+			log.Infoln("Unmarshal ChangeProxyParams %v", err)
-	}
+		}
-	proxies := tunnel.ProxiesWithProviders()
+		proxies := tunnel.ProxiesWithProviders()
-	proxy := proxies[*params.GroupName]
+		proxy := proxies[*params.GroupName]
-	if proxy == nil {
+		if proxy == nil {
-		return false
+			return
-	}
+		}
-	log.Infoln("change proxy %s", proxy.Name())
+		log.Infoln("change proxy %s", proxy.Name())
-	adapterProxy := proxy.(*adapter.Proxy)
+		adapterProxy := proxy.(*adapter.Proxy)
-	selector, ok := adapterProxy.ProxyAdapter.(*outboundgroup.Selector)
+		selector, ok := adapterProxy.ProxyAdapter.(*outboundgroup.Selector)
-	if !ok {
+		if !ok {
-		return false
+			return
-	}
+		}
-	if err := selector.Set(*params.ProxyName); err != nil {
+		if err := selector.Set(*params.ProxyName); err != nil {
-		return false
+			return
-	}
+		}
+	}()
 	return true
 }
 
@@ -130,8 +188,24 @@ func getTraffic() *C.char {
 	return C.CString(string(data))
 }
 
+//export getTotalTraffic
+func getTotalTraffic() *C.char {
+	up, down := statistic.DefaultManager.Total()
+	traffic := map[string]int64{
+		"up":   up,
+		"down": down,
+	}
+	data, err := json.Marshal(traffic)
+	if err != nil {
+		fmt.Println("Error:", err)
+		return C.CString("")
+	}
+	return C.CString(string(data))
+}
+
 //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{}
@@ -155,26 +229,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
 	}()
 }
 
@@ -182,7 +255,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 {
@@ -239,17 +312,117 @@ func getProviders() *C.char {
 func getProvider(name *C.char) *C.char {
 	providerName := C.GoString(name)
 	providers := tunnel.Providers()
-	var provider = providers[providerName]
+	data, err := json.Marshal(providers[providerName])
-	data, err := json.Marshal(provider)
 	if err != nil {
 		return C.CString("")
 	}
 	return C.CString(string(data))
 }
 
+//export getExternalProviders
+func getExternalProviders() *C.char {
+	externalProviders := make([]ExternalProvider, 0)
+	providers := tunnel.Providers()
+	for n, p := range providers {
+		if p.VehicleType() != cp.Compatible {
+			p := p.(*provider.ProxySetProvider)
+			externalProviders = append(externalProviders, ExternalProvider{
+				Name:        n,
+				Type:        p.Type().String(),
+				VehicleType: p.VehicleType().String(),
+				UpdateAt:    p.UpdatedAt,
+			})
+		}
+	}
+	for n, p := range tunnel.RuleProviders() {
+		if p.VehicleType() != cp.Compatible {
+			p := p.(*rp.RuleSetProvider)
+			externalProviders = append(externalProviders, ExternalProvider{
+				Name:        n,
+				Type:        p.Type().String(),
+				VehicleType: p.VehicleType().String(),
+				UpdateAt:    p.UpdatedAt,
+			})
+		}
+	}
+	data, err := json.Marshal(externalProviders)
+	if err != nil {
+		return C.CString("")
+	}
+	return C.CString(string(data))
+}
+
+//export updateExternalProvider
+func updateExternalProvider(providerName *C.char, providerType *C.char, port C.longlong) {
+	i := int64(port)
+	go func() {
+		providerNameString := C.GoString(providerName)
+		providerTypeString := C.GoString(providerType)
+
+		switch providerTypeString {
+		case "Proxy":
+			providers := tunnel.Providers()
+			err := providers[providerNameString].Update()
+			if err != nil {
+				bridge.SendToPort(i, err.Error())
+				return
+			}
+		case "Rule":
+			providers := tunnel.RuleProviders()
+			err := providers[providerNameString].Update()
+			if err != nil {
+				bridge.SendToPort(i, err.Error())
+				return
+			}
+		case "GeoIp":
+			err := mmdb.DownloadMMDB(constant.Path.Resolve(providerNameString))
+			if err != nil {
+				bridge.SendToPort(i, err.Error())
+				return
+			}
+		case "GeoSite":
+			err := mmdb.DownloadGeoSite(constant.Path.Resolve(providerNameString))
+			if err != nil {
+				bridge.SendToPort(i, err.Error())
+				return
+			}
+		case "ASN":
+			err := mmdb.DownloadASN(constant.Path.Resolve(providerNameString))
+			if err != nil {
+				bridge.SendToPort(i, err.Error())
+				return
+			}
+		}
+		bridge.SendToPort(i, "")
+	}()
+}
+
 //export initNativeApiBridge
 func initNativeApiBridge(api unsafe.Pointer, port C.longlong) {
 	bridge.InitDartApi(api)
 	i := int64(port)
 	bridge.Port = &i
 }
+
+func init() {
+	provider.HealthcheckHook = func(name string, delay uint16) {
+		delayData := &Delay{
+			Name: name,
+		}
+		if delay == 0 {
+			delayData.Value = -1
+		} else {
+			delayData.Value = int32(delay)
+		}
+		bridge.SendMessage(bridge.Message{
+			Type: bridge.Delay,
+			Data: delayData,
+		})
+	}
+	statistic.DefaultRequestNotify = func(c statistic.Tracker) {
+		bridge.SendMessage(bridge.Message{
+			Type: bridge.Request,
+			Data: c,
+		})
+	}
+}

core/log.go

@@ -18,6 +18,9 @@ func startLog() {
 	logSubscriber = log.Subscribe()
 	go func() {
 		for logData := range logSubscriber {
+			if logData.LogLevel < log.Level() {
+				continue
+			}
 			message := &bridge.Message{
 				Type: bridge.Log,
 				Data: logData,

core/process.go

@@ -1,3 +1,82 @@
 //go:build android
 
 package main
+
+import "C"
+import (
+	bridge "core/dart-bridge"
+	"encoding/json"
+	"errors"
+	"github.com/metacubex/mihomo/component/process"
+	"github.com/metacubex/mihomo/constant"
+	"sync"
+	"sync/atomic"
+	"time"
+)
+
+type ProcessMap struct {
+	m sync.Map
+}
+
+func (cm *ProcessMap) Store(key int64, value string) {
+	cm.m.Store(key, value)
+}
+
+func (cm *ProcessMap) Load(key int64) (string, bool) {
+	value, ok := cm.m.Load(key)
+	if !ok || value == nil {
+		return "", false
+	}
+	return value.(string), true
+}
+
+var counter int64 = 0
+
+var processMap ProcessMap
+
+func init() {
+	process.DefaultPackageNameResolver = func(metadata *constant.Metadata) (string, error) {
+		if metadata == nil {
+			return "", process.ErrInvalidNetwork
+		}
+		id := atomic.AddInt64(&counter, 1)
+
+		timeout := time.After(200 * time.Millisecond)
+
+		bridge.SendMessage(bridge.Message{
+			Type: bridge.Process,
+			Data: Process{
+				Id:       id,
+				Metadata: metadata,
+			},
+		})
+
+		for {
+			select {
+			case <-timeout:
+				return "", errors.New("package resolver timeout")
+			default:
+				value, exists := processMap.Load(id)
+				if exists {
+					return value, nil
+				}
+				time.Sleep(20 * time.Millisecond)
+			}
+		}
+	}
+}
+
+//export setProcessMap
+func setProcessMap(s *C.char) {
+	if s == nil {
+		return
+	}
+	go func() {
+		paramsString := C.GoString(s)
+		var processMapItem = &ProcessMapItem{}
+		err := json.Unmarshal([]byte(paramsString), processMapItem)
+		if err == nil {
+			processMap.Store(processMapItem.Id, processMapItem.Value)
+		}
+	}()
+}

core/tun.go

@@ -17,58 +17,46 @@ var tunLock sync.Mutex
 var tun *t.Tun
 
 //export startTUN
-func startTUN(fd C.int) bool {
+func startTUN(fd C.int) {
-	tunLock.Lock()
+	go func() {
-	defer tunLock.Unlock()
+		tunLock.Lock()
+		defer tunLock.Unlock()
 
-	if tun != nil {
+		if tun != nil {
-		tun.Close()
+			tun.Close()
-		tun = nil
+			tun = nil
-	}
+		}
-	f := int(fd)
+		f := int(fd)
-	gateway := "172.16.0.1/30"
+		gateway := "172.16.0.1/30"
-	portal := "172.16.0.2"
+		portal := "172.16.0.2"
-	dns := "0.0.0.0"
+		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)
+		if err != nil {
+			log.Errorln("startTUN error: %v", err)
+			tempTun.Close()
+		}
 
-	if err != nil {
+		tempTun.Closer = closer
-		log.Errorln("startTUN error: %v", err)
-		tempTun.Close()
-		return false
-	}
 
-	tempTun.Closer = closer
+		tun = tempTun
-
+	}()
-	tun = tempTun
-
-	return true
-}
-
-//export updateMarkSocketPort
-func updateMarkSocketPort(markSocketPort C.longlong) bool {
-	tunLock.Lock()
-	defer tunLock.Unlock()
-	//if tun != nil {
-	//	tun.MarkSocketPort = int64(markSocketPort)
-	//}
-	return true
 }
 
 //export stopTun
 func stopTun() {
-	tunLock.Lock()
+	go func() {
-	defer tunLock.Unlock()
+		tunLock.Lock()
+		defer tunLock.Unlock()
 
-	if tun != nil {
+		if tun != nil {
-		tun.Close()
+			tun.Close()
-		applyConfig(true)
+			tun = nil
-		tun = nil
+		}
-	}
+	}()
 }
 
 func init() {

lib/application.dart

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

lib/clash/core.dart

@@ -1,12 +1,13 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:ffi';
 import 'dart:io';
 import 'dart:isolate';
 
 import 'package:ffi/ffi.dart';
-import '../enum/enum.dart';
+import 'package:fl_clash/common/common.dart';
-import '../models/models.dart';
+import 'package:fl_clash/enum/enum.dart';
-import '../common/common.dart';
+import 'package:fl_clash/models/models.dart';
 import 'generated/clash_ffi.dart';
 
 class ClashCore {
@@ -16,19 +17,22 @@ class ClashCore {
   late final ClashFFI clashFFI;
   late final DynamicLibrary lib;
 
-  ClashCore._internal() {
+  DynamicLibrary _getClashLib() {
     if (Platform.isWindows) {
-      lib = DynamicLibrary.open("libclash.dll");
+      return DynamicLibrary.open("libclash.dll");
-      clashFFI = ClashFFI(lib);
     }
     if (Platform.isMacOS) {
-      lib = DynamicLibrary.open("libclash.dylib");
+      return DynamicLibrary.open("libclash.dylib");
-      clashFFI = ClashFFI(lib);
     }
     if (Platform.isAndroid || Platform.isLinux) {
-      lib = DynamicLibrary.open("libclash.so");
+      return DynamicLibrary.open("libclash.so");
-      clashFFI = ClashFFI(lib);
     }
+    throw "Platform is not supported";
+  }
+
+  ClashCore._internal() {
+    lib = _getClashLib();
+    clashFFI = ClashFFI(lib);
     clashFFI.initNativeApiBridge(
       NativeApi.initializeApiDLData,
       receiver.sendPort.nativePort,
@@ -42,8 +46,8 @@ class ClashCore {
 
   bool init(String homeDir) {
     return clashFFI.initClash(
-          homeDir.toNativeUtf8().cast(),
+      homeDir.toNativeUtf8().cast(),
-        ) ==
+    ) ==
         1;
   }
 
@@ -54,19 +58,37 @@ class ClashCore {
 
   bool get isInit => clashFFI.getIsInit() == 1;
 
-  bool validateConfig(String data) {
+  Future<String> validateConfig(String data) {
-    return clashFFI.validateConfig(
+    final completer = Completer<String>();
-          data.toNativeUtf8().cast(),
+    final receiver = ReceivePort();
-        ) ==
+    receiver.listen((message) {
-        1;
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    clashFFI.validateConfig(
+      data.toNativeUtf8().cast(),
+      receiver.sendPort.nativePort,
+    );
+    return completer.future;
   }
 
-  bool updateConfig(UpdateConfigParams updateConfigParams) {
+  Future<String> updateConfig(UpdateConfigParams updateConfigParams) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
     final params = json.encode(updateConfigParams);
-    return clashFFI.updateConfig(
+    clashFFI.updateConfig(
-          params.toNativeUtf8().cast(),
+      params.toNativeUtf8().cast(),
-        ) ==
+      receiver.sendPort.nativePort,
-        1;
+    );
+    return completer.future;
   }
 
   Future<List<Group>> getProxiesGroups() {
@@ -74,20 +96,20 @@ class ClashCore {
     final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
     return Isolate.run<List<Group>>(() {
       final proxies = json.decode(proxiesRawString);
-      final groupsRaw = (proxies[UsedProxy.GLOBAL.name]["all"] as List)
+      final groupNames = [
-          .where((e) {
+        UsedProxy.GLOBAL.name,
-        final proxy = proxies[e];
+        ...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
-        final excludeName = !UsedProxyExtension.valueList
+          final proxy = proxies[e] ?? {};
-            .where((element) => element != UsedProxy.GLOBAL.name)
+          return GroupTypeExtension.valueList.contains(proxy['type']) &&
-            .contains(proxy['name']);
+              proxy['hidden'] != true;
-        final validType = GroupTypeExtension.valueList.contains(proxy['type']);
+        })
-        return excludeName && validType;
+      ];
-      }).map((groupName) {
+      final groupsRaw = groupNames.map((groupName) {
         final group = proxies[groupName];
         group["all"] = ((group["all"] ?? []) as List)
             .map(
               (name) => proxies[name],
-            )
+        )
             .toList();
         return group;
       }).toList();
@@ -95,18 +117,74 @@ class ClashCore {
     });
   }
 
+  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());
+    final completer = Completer<Delay>();
-    return true;
+    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());
   }
 
   VersionInfo getVersionInfo() {
@@ -121,6 +199,13 @@ class ClashCore {
     return Traffic.fromMap(trafficMap);
   }
 
+
+  Traffic getTotalTraffic() {
+    final trafficRaw = clashFFI.getTotalTraffic();
+    final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
+    return Traffic.fromMap(trafficMap);
+  }
+
   void startLog() {
     clashFFI.startLog();
   }
@@ -133,14 +218,28 @@ class ClashCore {
     clashFFI.startTUN(fd);
   }
 
+  requestGc() {
+    clashFFI.forceGc();
+  }
+
   void stopTun() {
     clashFFI.stopTun();
   }
 
+  void setProcessMap(ProcessMapItem processMapItem) {
+    clashFFI.setProcessMap(json.encode(processMapItem).toNativeUtf8().cast());
+  }
+
+  // DateTime? getRunTime() {
+  //   final runTimeString = clashFFI.getRunTime().cast<Utf8>().toDartString();
+  //   if (runTimeString.isEmpty) return null;
+  //   return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
+  // }
+
   List<Connection> getConnections() {
     final connectionsDataRaw = clashFFI.getConnections();
     final connectionsData =
-        json.decode(connectionsDataRaw.cast<Utf8>().toDartString()) as Map;
+    json.decode(connectionsDataRaw.cast<Utf8>().toDartString()) as Map;
     final connectionsRaw = connectionsData['connections'] as List? ?? [];
     return connectionsRaw.map((e) => Connection.fromJson(e)).toList();
   }

lib/clash/generated/clash_ffi.dart

@@ -893,33 +893,61 @@ class ClashFFI {
       _lookup<ffi.NativeFunction<GoUint8 Function()>>('shutdownClash');
   late final _shutdownClash = _shutdownClashPtr.asFunction<int Function()>();
 
-  int validateConfig(
+  void forceGc() {
+    return _forceGc();
+  }
+
+  late final _forceGcPtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function()>>('forceGc');
+  late final _forceGc = _forceGcPtr.asFunction<void Function()>();
+
+  void validateConfig(
     ffi.Pointer<ffi.Char> s,
+    int port,
   ) {
     return _validateConfig(
       s,
+      port,
     );
   }
 
-  late final _validateConfigPtr =
+  late final _validateConfigPtr = _lookup<
-      _lookup<ffi.NativeFunction<GoUint8 Function(ffi.Pointer<ffi.Char>)>>(
+      ffi.NativeFunction<
-          'validateConfig');
+          ffi.Void Function(
-  late final _validateConfig =
+              ffi.Pointer<ffi.Char>, ffi.LongLong)>>('validateConfig');
-      _validateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>();
+  late final _validateConfig = _validateConfigPtr
+      .asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
 
-  int updateConfig(
+  void updateConfig(
     ffi.Pointer<ffi.Char> s,
+    int port,
   ) {
     return _updateConfig(
       s,
+      port,
+    );
+  }
+
+  late final _updateConfigPtr = _lookup<
+      ffi.NativeFunction<
+          ffi.Void Function(
+              ffi.Pointer<ffi.Char>, ffi.LongLong)>>('updateConfig');
+  late final _updateConfig =
+      _updateConfigPtr.asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
+
+  void clearEffect(
+    ffi.Pointer<ffi.Char> s,
+  ) {
+    return _clearEffect(
+      s,
     );
   }
 
-  late final _updateConfigPtr =
+  late final _clearEffectPtr =
-      _lookup<ffi.NativeFunction<GoUint8 Function(ffi.Pointer<ffi.Char>)>>(
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
-          'updateConfig');
+          'clearEffect');
-  late final _updateConfig =
+  late final _clearEffect =
-      _updateConfigPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>();
+      _clearEffectPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
 
   ffi.Pointer<ffi.Char> getProxies() {
     return _getProxies();
@@ -955,19 +983,32 @@ class ClashFFI {
   late final _getTraffic =
       _getTrafficPtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
 
+  ffi.Pointer<ffi.Char> getTotalTraffic() {
+    return _getTotalTraffic();
+  }
+
+  late final _getTotalTrafficPtr =
+      _lookup<ffi.NativeFunction<ffi.Pointer<ffi.Char> Function()>>(
+          'getTotalTraffic');
+  late final _getTotalTraffic =
+      _getTotalTrafficPtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
+
   void asyncTestDelay(
     ffi.Pointer<ffi.Char> s,
+    int port,
   ) {
     return _asyncTestDelay(
       s,
+      port,
     );
   }
 
-  late final _asyncTestDelayPtr =
+  late final _asyncTestDelayPtr = _lookup<
-      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
+      ffi.NativeFunction<
-          'asyncTestDelay');
+          ffi.Void Function(
-  late final _asyncTestDelay =
+              ffi.Pointer<ffi.Char>, ffi.LongLong)>>('asyncTestDelay');
-      _asyncTestDelayPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
+  late final _asyncTestDelay = _asyncTestDelayPtr
+      .asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
 
   ffi.Pointer<ffi.Char> getVersionInfo() {
     return _getVersionInfo();
@@ -1037,6 +1078,35 @@ class ClashFFI {
   late final _getProvider = _getProviderPtr
       .asFunction<ffi.Pointer<ffi.Char> Function(ffi.Pointer<ffi.Char>)>();
 
+  ffi.Pointer<ffi.Char> getExternalProviders() {
+    return _getExternalProviders();
+  }
+
+  late final _getExternalProvidersPtr =
+      _lookup<ffi.NativeFunction<ffi.Pointer<ffi.Char> Function()>>(
+          'getExternalProviders');
+  late final _getExternalProviders =
+      _getExternalProvidersPtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
+
+  void updateExternalProvider(
+    ffi.Pointer<ffi.Char> providerName,
+    ffi.Pointer<ffi.Char> providerType,
+    int port,
+  ) {
+    return _updateExternalProvider(
+      providerName,
+      providerType,
+      port,
+    );
+  }
+
+  late final _updateExternalProviderPtr = _lookup<
+      ffi.NativeFunction<
+          ffi.Void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>,
+              ffi.LongLong)>>('updateExternalProvider');
+  late final _updateExternalProvider = _updateExternalProviderPtr.asFunction<
+      void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>, int)>();
+
   void initNativeApiBridge(
     ffi.Pointer<ffi.Void> api,
     int port,
@@ -1070,7 +1140,21 @@ class ClashFFI {
       _lookup<ffi.NativeFunction<ffi.Void Function()>>('stopLog');
   late final _stopLog = _stopLogPtr.asFunction<void Function()>();
 
-  int startTUN(
+  void setProcessMap(
+    ffi.Pointer<ffi.Char> s,
+  ) {
+    return _setProcessMap(
+      s,
+    );
+  }
+
+  late final _setProcessMapPtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
+          'setProcessMap');
+  late final _setProcessMap =
+      _setProcessMapPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
+
+  void startTUN(
     int fd,
   ) {
     return _startTUN(
@@ -1079,22 +1163,8 @@ class ClashFFI {
   }
 
   late final _startTUNPtr =
-      _lookup<ffi.NativeFunction<GoUint8 Function(ffi.Int)>>('startTUN');
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Int)>>('startTUN');
-  late final _startTUN = _startTUNPtr.asFunction<int Function(int)>();
+  late final _startTUN = _startTUNPtr.asFunction<void Function(int)>();
-
-  int updateMarkSocketPort(
-    int markSocketPort,
-  ) {
-    return _updateMarkSocketPort(
-      markSocketPort,
-    );
-  }
-
-  late final _updateMarkSocketPortPtr =
-      _lookup<ffi.NativeFunction<GoUint8 Function(ffi.LongLong)>>(
-          'updateMarkSocketPort');
-  late final _updateMarkSocketPort =
-      _updateMarkSocketPortPtr.asFunction<int Function(int)>();
 
   void stopTun() {
     return _stopTun();

lib/clash/message.dart

@@ -14,7 +14,13 @@ abstract mixin class ClashMessageListener {
 
   void onDelay(Delay delay) {}
 
-  void onProcess(Metadata metadata) {}
+  void onProcess(Process process) {}
+
+  void onRequest(Connection connection) {}
+
+  void onNow(Now now) {}
+
+  void onRun(String runTime) {}
 }
 
 class ClashMessage {
@@ -39,7 +45,16 @@ class ClashMessage {
             listener.onDelay(Delay.fromJson(m.data));
             break;
           case MessageType.process:
-            listener.onProcess(Metadata.fromJson(m.data));
+            listener.onProcess(Process.fromJson(m.data));
+            break;
+          case MessageType.now:
+            listener.onNow(Now.fromJson(m.data));
+            break;
+          case MessageType.request:
+            listener.onRequest(Connection.fromJson(m.data));
+            break;
+          case MessageType.run:
+            listener.onRun(m.data);
             break;
         }
       }

lib/clash/service.dart

@@ -1,23 +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 {
+  Future<void> initGeo() async {
-    final mmdbPath = await appPath.getMMDBPath();
+    final homePath = await appPath.getHomeDirPath();
-    var mmdbFile = File(mmdbPath);
+    final homeDir = Directory(homePath);
-    final isExists = await mmdbFile.exists();
+    final isExists = await homeDir.exists();
-    if (isExists) return true;
+    if (!isExists) {
+      await homeDir.create(recursive: true);
+    }
+    const geoFileNameList = [
+      mmdbFileName,
+      geoSiteFileName,
+      asnFileName,
+    ];
     try {
-      mmdbFile = await mmdbFile.create(recursive: true);
+      for (final geoFileName in geoFileNameList) {
-      ByteData data = await rootBundle.load('assets/data/geoip.metadb');
+        final geoFile = File(
-      List<int> bytes = data.buffer.asUint8List();
+          join(homePath, geoFileName),
-      await mmdbFile.writeAsBytes(bytes, flush: true);
+        );
-      return true;
+        final isExists = await geoFile.exists();
-    } catch (_) {
+        if (isExists) {
-      return false;
+          continue;
+        }
+        final data = await rootBundle.load('assets/data/$geoFileName');
+        List<int> bytes = data.buffer.asUint8List();
+        await geoFile.writeAsBytes(bytes, flush: true);
+      }
+    } catch (e) {
+      debugPrint("$e");
+      exit(0);
     }
   }
 
@@ -25,8 +43,7 @@ class ClashService {
     required ClashConfig clashConfig,
     required Config config,
   }) async {
-    final isInitMmdb = await initMmdb();
+    await initGeo();
-    if (!isInitMmdb) return false;
     final homeDirPath = await appPath.getHomeDirPath();
     final isInit = clashCore.init(homeDirPath);
     return isInit;

lib/common/android.dart

@@ -7,6 +7,7 @@ class Android {
   init() async {
     app?.onExit = () {
       clashCore.shutdown();
+      print("adsadda==>");
       exit(0);
     };
   }

lib/common/common.dart

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

lib/common/constant.dart

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

lib/common/context.dart

@@ -1,15 +1,7 @@
-import 'package:fl_clash/application.dart';
-import 'package:fl_clash/controller.dart';
 import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';
 
 extension BuildContextExtension on BuildContext {
-  AppController get appController {
-    final appController =
-        findAncestorStateOfType<ApplicationState>()?.appController;
-    assert(appController != null, "only use application environment");
-    return appController!;
-  }
 
   CommonScaffoldState? get commonScaffoldState {
     return findAncestorStateOfType<CommonScaffoldState>();
@@ -19,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/file.dart

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

lib/common/function.dart

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

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,21 @@ class Navigation {
         label: "profiles",
         fragment: ProfilesFragment(),
       ),
+      const NavigationItem(
+        icon:  Icon(Icons.ballot),
+        label: "requests",
+        fragment:  RequestFragment(),
+        description: "requestsDesc",
+        modes: [NavigationItemMode.desktop, NavigationItemMode.more],
+      ),
+      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

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

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

lib/common/preferences.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:flutter/cupertino.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../models/models.dart';
@@ -23,42 +22,40 @@ 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 {
       return ClashConfig.fromJson(clashConfigMap);
     } catch (e) {
-      debugPrint(e.toString());
+      throw e.toString();
-      return null;
     }
   }
 
   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 {
       return Config.fromJson(configMap);
     } catch (e) {
-      debugPrint(e.toString());
+      throw e.toString();
-      return null;
     }
   }
 
   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 'package:fl_clash/models/ip.dart';
-import '../models/models.dart';
+import 'package:fl_clash/state.dart';
 
 class Request {
-  static Future<Result<Response>> getFileResponseForUrl(String url) async {
+  late final Dio _dio;
-    final headers = {'User-Agent': appConstant.name};
+  int? _port;
-    try {
+  bool _isStart = false;
-      final response = await get(Uri.parse(url), headers: headers).timeout(
+
-        appConstant.httpTimeoutDuration,
+  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 {
+  Future<Response> getFileResponseForUrl(String url) async {
-    final response = await get(
+    final response = await _dio
-      Uri.parse(
+        .get(
-        "https://api.github.com/repos/${appConstant.repository}/releases/latest",
+          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();
+    if (response.statusCode != 200) return null;
-    final body = json.decode(response.body);
+    final data = response.data as Map<String, dynamic>;
-    final remoteVersion = body['tag_name'];
+    final remoteVersion = data['tag_name'];
     final packageInfo = await appPackage.packageInfoCompleter.future;
     final version = packageInfo.version;
     final hasUpdate =
-        Other.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
+        other.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
-    if (!hasUpdate) return Result.error();
+    if (!hasUpdate) return null;
-    return Result.success(data: body['body']);
+    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,13 +1,12 @@
 import 'dart:async';
-import 'dart:io';
-import 'dart:isolate';
 
+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';
 
@@ -32,10 +31,10 @@ class AppController {
   Future<void> updateSystemProxy(bool isStart) async {
     if (isStart) {
       await globalState.startSystemProxy(
+        appState: appState,
         config: config,
         clashConfig: clashConfig,
       );
-
       updateRunTime();
       updateTraffic();
       globalState.updateFunctionLists = [
@@ -78,23 +77,17 @@ 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 {
     config.deleteProfileById(id);
     final profilePath = await appPath.getProfilePath(id);
     if (profilePath == null) return;
-    final file = File(profilePath);
+    clashCore.clearEffect(profilePath);
-    Isolate.run(() async {
-      final isExists = await file.exists();
-      if (isExists) {
-        file.delete();
-      }
-    });
     if (config.currentProfileId == id) {
       if (config.profiles.isNotEmpty) {
         final updateId = config.profiles.first.id;
@@ -105,47 +98,73 @@ 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();
+      final tempProfile = profile.copyWith();
-      if (res.type == ResultType.success) {
+      await tempProfile.update();
-        config.setProfile(profile);
+      config.setProfile(tempProfile);
-      }
     }
   }
 
-  Future<bool> updateClashConfig({bool isPatch = true}) async {
+  Future<void> updateClashConfig({bool isPatch = true}) async {
-    return await globalState.updateClashConfig(
+    await globalState.updateClashConfig(
       clashConfig: clashConfig,
       config: config,
       isPatch: isPatch,
     );
   }
 
+  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,
+      );
+    });
+  }
+
   changeProfile(String? value) async {
     if (value == config.currentProfileId) return;
     config.currentProfileId = value;
-    await updateClashConfig(isPatch: false);
+    await applyProfile();
-    await updateGroups();
-    changeProxy();
     appState.delayMap = {};
     saveConfigPreferences();
   }
 
   autoUpdateProfiles() async {
     for (final profile in config.profiles) {
-      if (!profile.autoUpdate) return;
+      if (!profile.autoUpdate) continue;
       final isNotNeedUpdate = profile.lastUpdateDate
           ?.add(
             profile.autoUpdateDuration,
           )
-          .isBeforeNow();
+          .isBeforeNow;
-      if (isNotNeedUpdate == false) continue;
+      if (isNotNeedUpdate == false || profile.type == ProfileType.file) {
-      final result = await profile.update();
+        continue;
-      if (result.type == ResultType.error) continue;
+      }
-      await updateGroups();
+      try {
-      changeProxy();
+        await updateProfile(profile.id);
+      } catch (e) {
+        appState.addLog(
+          Log(
+            logLevel: LogLevel.info,
+            payload: e.toString(),
+          ),
+        );
+      }
+    }
+  }
+
+  updateProfiles() async {
+    for (final profile in config.profiles) {
+      if (profile.type == ProfileType.file) {
+        continue;
+      }
+      await updateProfile(profile.id);
     }
   }
 
@@ -157,13 +176,6 @@ class AppController {
     appState.systemColorSchemes = systemColorSchemes;
   }
 
-  clearCurrentDelay() {
-    final currentProxyName =
-        appState.getCurrentProxyName(config.currentProxyName, clashConfig.mode);
-    if (currentProxyName == null) return;
-    appState.setDelay(Delay(name: currentProxyName, value: null));
-  }
-
   savePreferences() async {
     await saveConfigPreferences();
     await saveClashConfigPreferences();
@@ -206,29 +218,99 @@ class AppController {
     }
   }
 
-  afterInit() async {
+  autoCheckUpdate() async {
-    if (appState.isInit) {
+    if (!config.autoCheckUpdate) return;
-      if (config.autoRun) {
+    final res = await request.checkForUpdate();
-        await updateSystemProxy(true);
+    checkUpdateResultHandle(data: res);
-      } else {
+  }
-        await proxyManager.updateStartTime();
+
-        await updateSystemProxy(proxyManager.isStart);
+  checkUpdateResultHandle({
-      }
+    Map<String, dynamic>? data,
-      autoUpdateProfiles();
+    bool handleError = false,
-      updateLogStatus();
+  }) async {
-      if (!config.silentLaunch) {
+    if (data != null) {
-        window?.show();
+      final tagName = data['tag_name'];
-      }
+      final body = data['body'];
+      final submits = other.parseReleaseBody(body);
+      final textTheme = context.textTheme;
+      globalState.showMessage(
+        title: appLocalizations.discoverNewVersion,
+        message: TextSpan(
+          text: "$tagName \n",
+          style: textTheme.headlineSmall,
+          children: [
+            TextSpan(
+              text: "\n",
+              style: textTheme.bodyMedium,
+            ),
+            for (final submit in submits)
+              TextSpan(
+                text: "- $submit \n",
+                style: 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,
+        ),
+      );
     }
   }
 
+  init() async {
+    if (!config.silentLaunch) {
+      window?.show();
+    }
+    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
+    if (commonScaffoldState?.mounted == true) {
+      await commonScaffoldState?.loadingRun(() async {
+        await globalState.applyProfile(
+          appState: appState,
+          config: config,
+          clashConfig: clashConfig,
+        );
+      },title: appLocalizations.init);
+    } else {
+      await globalState.applyProfile(
+        appState: appState,
+        config: config,
+        clashConfig: clashConfig,
+      );
+    }
+    await afterInit();
+  }
+
+  afterInit() async {
+    if (config.autoRun) {
+      await updateSystemProxy(true);
+    } else {
+      await proxyManager.updateStartTime();
+      await updateSystemProxy(proxyManager.isStart);
+    }
+    autoUpdateProfiles();
+    updateLogStatus();
+    autoCheckUpdate();
+  }
+
   setDelay(Delay delay) {
     appState.setDelay(delay);
   }
 
   toPage(int index, {bool hasAnimate = false}) {
-    final nextLabel = globalState.currentNavigationItems[index].label;
+    if (index > appState.currentNavigationItems.length - 1) {
-    appState.currentLabel = nextLabel;
+      return;
+    }
+    appState.currentLabel = appState.currentNavigationItems[index].label;
     if ((config.isAnimateToPage || hasAnimate)) {
       globalState.pageController?.animateToPage(
         index,
@@ -240,12 +322,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) {
@@ -253,31 +331,6 @@ class AppController {
     }
   }
 
-  addProfileFormURL(String url) async {
-    globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
-    toProfiles();
-    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
-    if (commonScaffoldState?.mounted != true) return;
-    commonScaffoldState?.loadingRun(
-      () async {
-        await Future.delayed(const Duration(milliseconds: 300));
-        final profile = Profile(
-          url: url,
-        );
-        final res = await profile.update();
-        if (res.type == ResultType.success) {
-          addProfile(profile);
-        } else {
-          debugPrint(res.message);
-          globalState.showMessage(
-            title: "${appLocalizations.add}${appLocalizations.profile}",
-            message: TextSpan(text: res.message!),
-          );
-        }
-      },
-    );
-  }
-
   initLink() {
     linkManager.initAppLinksListen(
       (url) {
@@ -307,33 +360,60 @@ class AppController {
     );
   }
 
+  addProfileFormURL(String url) async {
+    globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
+    toProfiles();
+    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
+    if (commonScaffoldState?.mounted != true) return;
+    final profile = await commonScaffoldState?.loadingRun<Profile>(
+      () async {
+        final profile = Profile(
+          url: url,
+        );
+        await profile.update();
+        return profile;
+      },
+      title: "${appLocalizations.add}${appLocalizations.profile}",
+    );
+    if (profile != null) {
+      await addProfile(profile);
+    }
+  }
+
   addProfileFormFile() async {
-    final result = await FileUtil.pickerConfig();
+    final platformFile = await globalState.safeRun(picker.pickerConfigFile);
-    if (result.type == ResultType.error) return;
     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 profile = Profile(label: platformFile?.name);
-        final sRes = await profile.saveFile(bytes);
+        await profile.saveFile(bytes);
-        if (sRes.type == ResultType.error) {
+        return profile;
-          debugPrint(sRes.message);
-          globalState.showMessage(
-            title: "${appLocalizations.add}${appLocalizations.profile}",
-            message: TextSpan(text: sRes.message!),
-          );
-          return;
-        }
-        addProfile(profile);
       },
+      title: "${appLocalizations.add}${appLocalizations.profile}",
     );
+    if (profile != null) {
+      await addProfile(profile);
+    }
+  }
+
+  addProfileFormQrCode() async {
+    final url = await globalState.safeRun(picker.pickerConfigQRCode);
+    if (url == null) return;
+    addProfileFormURL(url);
+  }
+
+  updateViewWidth(double width) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      appState.viewWidth = width;
+    });
   }
 }

lib/enum/enum.dart

@@ -1,6 +1,8 @@
 // ignore_for_file: constant_identifier_names
 
-enum GroupType { Selector, URLTest, Fallback }
+enum GroupType { Selector, URLTest, Fallback, LoadBalance, Relay }
+
+enum GroupName { GLOBAL, Proxy, Auto, Fallback }
 
 extension GroupTypeExtension on GroupType {
   static List<String> get valueList => GroupType.values
@@ -32,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 }
@@ -52,4 +56,11 @@ enum ProfileType { file, url }
 
 enum ResultType { success, error }
 
-enum MessageType { log, tun, delay, process }
+enum MessageType { log, tun, delay, process, now, request, run }
+
+enum FindProcessMode { always, off }
+
+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,25 +80,23 @@ class AboutFragment extends StatelessWidget {
         ListTile(
           title: Text(appLocalizations.checkUpdate),
           onTap: () {
-            final commonScaffoldState = context.commonScaffoldState;
+            _checkUpdate(context);
-            if (commonScaffoldState?.mounted != true) return;
-            commonScaffoldState?.loadingRun(() async {
-              await globalState.checkUpdate(
-                () {
-                  launchUrl(
-                    Uri.parse(
-                        "https://github.com/${appConstant.repository}/releases/latest"),
-                  );
-                },
-              );
-            });
           },
         ),
+        ListTile(
+          title: const Text("Telegram"),
+          onTap: () {
+            launchUrl(
+              Uri.parse("https://t.me/+G-veVtwBOl4wODc1"),
+            );
+          },
+          trailing: const Icon(Icons.launch),
+        ),
         ListTile(
           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,62 +1,38 @@
+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';
 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: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({
+  @override
-    required Package package,
+  State<AccessFragment> createState() => _AccessFragmentState();
-    required bool value,
+}
-    required bool isActive,
+
-    required void Function(bool?) onChanged,
+class _AccessFragmentState extends State<AccessFragment> {
-  }) {
+  final packagesListenable = ValueNotifier<List<Package>>([]);
-    return AbsorbPointer(
+
-      absorbing: !isActive,
+  @override
-      child: ListItem.checkbox(
+  void initState() {
-        leading: SizedBox(
+    super.initState();
-          width: 48,
+    WidgetsBinding.instance.addPostFrameCallback((_) {
-          height: 48,
+      Future.delayed(const Duration(milliseconds: 300), () async {
-          child: FutureBuilder<ImageProvider?>(
+        packagesListenable.value = await app?.getPackages() ?? [];
-            future: app?.getPackageIcon(package.packageName),
+      });
-            builder: (_, snapshot) {
+    });
-              if (!snapshot.hasData && snapshot.data == null) {
-                return Container();
-              } else {
-                return Image(
-                  image: snapshot.data!,
-                  gaplessPlayback: true,
-                  width: 48,
-                  height: 48,
-                );
-              }
-            },
-          ),
-        ),
-        title: Text(
-          package.label,
-          style: const TextStyle(
-            overflow: TextOverflow.ellipsis,
-          ),
-          maxLines: 1,
-        ),
-        subtitle: Text(
-          package.packageName,
-          style: const TextStyle(
-            overflow: TextOverflow.ellipsis,
-          ),
-          maxLines: 1,
-        ),
-        delegate: CheckboxDelegate(
-          value: value,
-          onChanged: onChanged,
-        ),
-      ),
-    );
   }
 
   Widget _buildAppProxyModePopup() {
@@ -114,177 +90,256 @@ class AccessFragment extends StatelessWidget {
     );
   }
 
-  Widget _buildSelectedAllButton({
+  Widget _buildSearchButton(List<Package> packages) {
-    required bool isSelectedAll,
+    return IconButton(
-    required List<String> allValueList,
+      tooltip: appLocalizations.search,
-  }) {
+      onPressed: () {
-    return Builder(
+        showSearch(
-      builder: (context) {
+          context: context,
-        final tooltip = isSelectedAll
+          delegate: AccessControlSearchDelegate(
-            ? appLocalizations.cancelSelectAll
+            packages: packages,
-            : appLocalizations.selectAll;
+          ),
-        return IconButton(
+        ).then((_) => {setState(() {})});
-          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),
-        );
       },
+      icon: const Icon(Icons.search),
     );
   }
 
-  Widget _buildPackageList(bool isAccessControl) {
+  _buildSelectedAllButton({
-    return Selector2<AppState, Config, PackageListSelectorState>(
+    required bool isAccessControl,
-      selector: (_, appState, config) => PackageListSelectorState(
+    required bool isSelectedAll,
-        accessControl: config.accessControl,
+    required List<String> allValueList,
-        packages: appState.packages,
+  }) {
-      ),
+    WidgetsBinding.instance.addPostFrameCallback((_) {
-      builder: (context, state, __) {
+      final tooltip = isSelectedAll
-        final accessControl = state.accessControl;
+          ? appLocalizations.cancelSelectAll
-        final isFilterSystemApp = accessControl.isFilterSystemApp;
+          : appLocalizations.selectAll;
-        final packages = isFilterSystemApp
+      final commonScaffoldState =
-            ? state.packages
+          context.findAncestorStateOfType<CommonScaffoldState>();
-                .where((element) => element.isSystem == false)
+      commonScaffoldState?.floatingActionButton = DisabledMask(
-                .toList()
+        status: !isAccessControl,
-            : state.packages;
+        child: AbsorbPointer(
-        final packageNameList = packages.map((e) => e.packageName).toList();
+          absorbing: !isAccessControl,
-        final accessControlMode = accessControl.mode;
+          child: FloatingActionButton (
-        final valueList =
+            tooltip: tooltip,
-            accessControl.currentList.intersection(packageNameList);
+            onPressed: () {
-        final describe = accessControlMode == AccessControlMode.acceptSelected
+              final config = globalState.appController.config;
-            ? appLocalizations.accessControlAllowDesc
+              final isAccept =
-            : appLocalizations.accessControlNotAllowDesc;
+                  config.accessControl.mode == AccessControlMode.acceptSelected;
 
-        final listView = ListView.builder(
+              if (isSelectedAll) {
-          itemCount: packages.length,
+                config.accessControl = switch (isAccept) {
-          itemBuilder: (_, index) {
+                  true => config.accessControl.copyWith(
-            final package = packages[index];
+                      acceptList: [],
-            return _buildPackageItem(
+                    ),
-              package: package,
+                  false => config.accessControl.copyWith(
-              value: valueList.contains(package.packageName),
+                      rejectList: [],
-              isActive: isAccessControl,
+                    ),
-              onChanged: (value) {
+                };
-                if (value == true) {
+              } else {
-                  valueList.add(package.packageName);
+                config.accessControl = switch (isAccept) {
-                } else {
+                  true => config.accessControl.copyWith(
-                  valueList.remove(package.packageName);
+                      acceptList: allValueList,
-                }
+                    ),
-                final config = context.read<Config>();
+                  false => config.accessControl.copyWith(
-                config.accessControl.currentList = valueList;
+                      rejectList: allValueList,
-                config.accessControl = config.accessControl.copyWith();
+                    ),
-              },
+                };
+              }
+            },
+            child: isSelectedAll
+                ? const Icon(Icons.deselect)
+                : const Icon(Icons.select_all),
+          ),
+        ),
+      );
+    });
+  }
+
+  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;
+            _buildSelectedAllButton(
+              isAccessControl: isAccessControl,
+              isSelectedAll: valueList.length == packageNameList.length,
+              allValueList: packageNameList,
             );
-          },
+            return DisabledMask(
-        );
+              status: !isAccessControl,
-
+              child: Column(
-        return DisabledMask(
+                children: [
-          status: !isAccessControl,
+                  AbsorbPointer(
-          child: Column(
+                    absorbing: !isAccessControl,
-            children: [
+                    child: Padding(
-              AbsorbPointer(
+                      padding: const EdgeInsets.only(
-                absorbing: !isAccessControl,
+                        top: 4,
-                child: Padding(
+                        bottom: 4,
-                  padding: const EdgeInsets.only(
+                        left: 16,
-                    top: 4,
+                        right: 8,
-                    bottom: 4,
-                    left: 16,
-                    right: 8,
-                  ),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    mainAxisSize: MainAxisSize.max,
-                    children: [
-                      Expanded(
-                        child: IntrinsicHeight(
-                          child: Column(
-                            mainAxisSize: MainAxisSize.max,
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Expanded(
-                                child: Row(
-                                  children: [
-                                    Flexible(
-                                      child: Text(
-                                        appLocalizations.selected,
-                                        style: Theme.of(context)
-                                            .textTheme
-                                            .labelLarge
-                                            ?.copyWith(
-                                              color: Theme.of(context)
-                                                  .colorScheme
-                                                  .primary,
-                                            ),
-                                      ),
-                                    ),
-                                    const Flexible(
-                                      child: SizedBox(
-                                        width: 8,
-                                      ),
-                                    ),
-                                    Flexible(
-                                      child: Text(
-                                        "${valueList.length}",
-                                        style: Theme.of(context)
-                                            .textTheme
-                                            .labelLarge
-                                            ?.copyWith(
-                                              color: Theme.of(context)
-                                                  .colorScheme
-                                                  .primary,
-                                            ),
-                                      ),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                              Flexible(
-                                child: Text(describe),
-                              )
-                            ],
-                          ),
-                        ),
                       ),
-                      Row(
+                      child: Row(
-                        mainAxisSize: MainAxisSize.min,
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        mainAxisAlignment: MainAxisAlignment.end,
+                        mainAxisSize: MainAxisSize.max,
                         children: [
-                          Flexible(
+                          Expanded(
-                            child: _buildSelectedAllButton(
+                            child: IntrinsicHeight(
-                              isSelectedAll:
+                              child: Column(
-                                  valueList.length == packageNameList.length,
+                                mainAxisSize: MainAxisSize.max,
-                              allValueList: packageNameList,
+                                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()),
+                          Row(
-                          Flexible(child: _buildAppProxyModePopup()),
+                            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,
-                ),
-              ),
-            ],
-          ),
         );
       },
     );
@@ -292,14 +347,9 @@ class AccessFragment extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if (context.appController.appState.packages.isEmpty) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        context.appController.updatePackages();
-      });
-    }
     return Selector<Config, bool>(
       selector: (_, config) => config.isAccessControl,
-      builder: (_, isAccessControl, __) {
+      builder: (_, isAccessControl, child) {
         return Column(
           mainAxisSize: MainAxisSize.max,
           children: [
@@ -323,11 +373,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 buildSuggestions(context);
+  }
+
+  @override
+  Widget buildSuggestions(BuildContext context) {
+    return _packageList(_results);
+  }
+}

lib/fragments/application_setting.dart

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

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
@@ -24,8 +26,8 @@ class _ConfigFragmentState extends State<ConfigFragment> {
       try {
         final mixedPort = int.parse(port);
         if (mixedPort < 1024 || mixedPort > 49151) throw "Invalid port";
-        context.appController.clashConfig.mixedPort = mixedPort;
+        globalState.appController.clashConfig.mixedPort = mixedPort;
-        context.appController.updateClashConfigDebounce();
+        globalState.appController.updateClashConfigDebounce();
       } catch (e) {
         globalState.showMessage(
           title: appLocalizations.proxyPort,
@@ -37,16 +39,171 @@ class _ConfigFragmentState extends State<ConfigFragment> {
     }
   }
 
-  _updateLoglevel(LogLevel? logLevel) {
+  Widget _buildAppSection() {
-    if (logLevel == null ||
+    final items = [
-        logLevel == context.appController.clashConfig.logLevel) return;
+      if (Platform.isAndroid)
-    context.appController.clashConfig.logLevel = logLevel;
+        Selector<Config, bool>(
-    context.appController.updateClashConfigDebounce();
+          selector: (_, config) => config.allowBypass,
+          builder: (_, allowBypass, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.arrow_forward_outlined),
+              title: Text(appLocalizations.allowBypass),
+              subtitle: Text(appLocalizations.allowBypassDesc),
+              delegate: SwitchDelegate(
+                value: allowBypass,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.config.allowBypass = value;
+                },
+              ),
+            );
+          },
+        ),
+      if (Platform.isAndroid)
+        Selector<Config, bool>(
+          selector: (_, config) => config.systemProxy,
+          builder: (_, systemProxy, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.settings_ethernet),
+              title: Text(appLocalizations.systemProxy),
+              subtitle: Text(appLocalizations.systemProxyDesc),
+              delegate: SwitchDelegate(
+                value: systemProxy,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.config.systemProxy = value;
+                },
+              ),
+            );
+          },
+        ),
+      Selector<Config, bool>(
+        selector: (_, config) => config.isCompatible,
+        builder: (_, isCompatible, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.expand_outlined),
+            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();
+              },
+            ),
+          );
+        },
+      ),
+    ];
+    return Section(
+      title: appLocalizations.app,
+      child: Column(
+        children: [
+          for (final item in items) ...[
+            item,
+            if (items.last != item)
+              const Divider(
+                height: 0,
+              )
+          ]
+        ],
+      ),
+    );
   }
 
-  @override
+  _showLogLevelDialog(LogLevel value) {
-  Widget build(BuildContext context) {
+    globalState.showCommonDialog(
-    List<Widget> items = [
+      child: AlertDialog(
+        title: Text(appLocalizations.logLevel),
+        contentPadding: const EdgeInsets.symmetric(
+          horizontal: 8,
+          vertical: 16,
+        ),
+        content: SizedBox(
+          width: 250,
+          child: Wrap(
+            children: [
+              for (final logLevel in LogLevel.values)
+                ListItem.radio(
+                  delegate: RadioDelegate<LogLevel>(
+                    value: logLevel,
+                    groupValue: value,
+                    onChanged: (LogLevel? value) {
+                      if (value == null) {
+                        return;
+                      }
+                      final appController = globalState.appController;
+                      appController.clashConfig.logLevel = value;
+                      appController.updateClashConfigDebounce();
+                      Navigator.of(context).pop();
+                    },
+                  ),
+                  title: Text(logLevel.name),
+                )
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildGeneralSection() {
+    final items = [
+      Selector<ClashConfig, LogLevel>(
+        selector: (_, clashConfig) => clashConfig.logLevel,
+        builder: (_, value, __) {
+          return ListItem(
+            leading: const Icon(Icons.info_outline),
+            title: Text(appLocalizations.logLevel),
+            subtitle: Text(value.name),
+            onTab: () {
+              _showLogLevelDialog(value);
+            },
+          );
+        },
+      ),
+      Selector<ClashConfig, int>(
+        selector: (_, clashConfig) => clashConfig.mixedPort,
+        builder: (_, mixedPort, __) {
+          return ListItem(
+            onTab: () {
+              _modifyMixedPort(mixedPort);
+            },
+            leading: const Icon(Icons.adjust_outlined),
+            title: Text(appLocalizations.proxyPort),
+            subtitle: Text(appLocalizations.proxyPortDesc),
+            trailing: FilledButton.tonal(
+              onPressed: () {
+                _modifyMixedPort(mixedPort);
+              },
+              child: Text(
+                "$mixedPort",
+              ),
+            ),
+          );
+        },
+      ),
+      Selector<ClashConfig, bool>(
+        selector: (_, clashConfig) => clashConfig.ipv6,
+        builder: (_, ipv6, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.water_outlined),
+            title: const Text("Ipv6"),
+            subtitle: Text(appLocalizations.ipv6Desc),
+            delegate: SwitchDelegate(
+              value: ipv6,
+              onChanged: (bool value) async {
+                final appController = globalState.appController;
+                appController.clashConfig.ipv6 = value;
+                appController.updateClashConfigDebounce();
+              },
+            ),
+          );
+        },
+      ),
       Selector<ClashConfig, bool>(
         selector: (_, clashConfig) => clashConfig.allowLan,
         builder: (_, allowLan, __) {
@@ -59,77 +216,181 @@ class _ConfigFragmentState extends State<ConfigFragment> {
               onChanged: (bool value) async {
                 final clashConfig = context.read<ClashConfig>();
                 clashConfig.allowLan = value;
-                context.appController.updateClashConfigDebounce();
+                globalState.appController.updateClashConfigDebounce();
               },
             ),
           );
         },
       ),
-      Selector<ClashConfig, int>(
+      Selector<ClashConfig, bool>(
-        selector: (_, clashConfig) => clashConfig.mixedPort,
+        selector: (_, clashConfig) => clashConfig.unifiedDelay,
-        builder: (_, mixedPort, __) {
+        builder: (_, unifiedDelay, __) {
-          return ListItem(
+          return ListItem.switchItem(
-            onTab: () {
+            leading: const Icon(Icons.compress_outlined),
-              _modifyMixedPort(mixedPort);
+            title: Text(appLocalizations.unifiedDelay),
-            },
+            subtitle: Text(appLocalizations.unifiedDelayDesc),
-            leading: const Icon(Icons.adjust),
+            delegate: SwitchDelegate(
-            title: Text(appLocalizations.proxyPort),
+              value: unifiedDelay,
-            trailing: FilledButton.tonal(
+              onChanged: (bool value) async {
-              onPressed: () {
+                final appController = globalState.appController;
-                _modifyMixedPort(mixedPort);
+                appController.clashConfig.unifiedDelay = value;
+                appController.updateClashConfigDebounce();
               },
-              child: Text(
-                "$mixedPort",
-              ),
             ),
           );
         },
       ),
-      Selector<ClashConfig, LogLevel>(
+      Selector<ClashConfig, bool>(
-        selector: (_, clashConfig) => clashConfig.logLevel,
+        selector: (_, clashConfig) =>
-        builder: (_, value, __) {
+            clashConfig.findProcessMode == FindProcessMode.always,
-          return ListItem(
+        builder: (_, findProcess, __) {
-            leading: const Icon(Icons.feedback),
+          return ListItem.switchItem(
-            title: Text(appLocalizations.logLevel),
+            leading: const Icon(Icons.polymer_outlined),
-            trailing: SizedBox(
+            title: Text(appLocalizations.findProcessMode),
-              height: 48,
+            subtitle: Text(appLocalizations.findProcessModeDesc),
-              child: DropdownMenu<LogLevel>(
+            delegate: SwitchDelegate(
-                width: 124,
+              value: findProcess,
-                inputDecorationTheme: const InputDecorationTheme(
+              onChanged: (bool value) async {
-                  filled: true,
+                final appController = globalState.appController;
-                  contentPadding: EdgeInsets.symmetric(
+                appController.clashConfig.findProcessMode =
-                    vertical: 5,
+                    value ? FindProcessMode.always : FindProcessMode.off;
-                    horizontal: 16,
+                appController.updateClashConfigDebounce();
-                  ),
+              },
-                ),
+            ),
-                initialSelection: value,
+          );
-                dropdownMenuEntries: [
+        },
-                  for (final logLevel in LogLevel.values)
+      ),
-                    DropdownMenuEntry<LogLevel>(
+      Selector<ClashConfig, bool>(
-                      value: logLevel,
+        selector: (_, clashConfig) => clashConfig.tcpConcurrent,
-                      label: logLevel.name,
+        builder: (_, tcpConcurrent, __) {
-                    )
+          return ListItem.switchItem(
-                ],
+            leading: const Icon(Icons.double_arrow_outlined),
-                onSelected: _updateLoglevel,
+            title: Text(appLocalizations.tcpConcurrent),
-              ),
+            subtitle: Text(appLocalizations.tcpConcurrentDesc),
+            delegate: SwitchDelegate(
+              value: tcpConcurrent,
+              onChanged: (bool value) async {
+                final appController = globalState.appController;
+                appController.clashConfig.tcpConcurrent = value;
+                appController.updateClashConfigDebounce();
+              },
+            ),
+          );
+        },
+      ),
+      Selector<ClashConfig, bool>(
+        selector: (_, clashConfig) =>
+            clashConfig.geodataLoader == geodataLoaderMemconservative,
+        builder: (_, memconservative, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.memory),
+            title: Text(appLocalizations.geodataLoader),
+            subtitle: Text(appLocalizations.geodataLoaderDesc),
+            delegate: SwitchDelegate(
+              value: memconservative,
+              onChanged: (bool value) async {
+                final appController = globalState.appController;
+                appController.clashConfig.geodataLoader = value
+                    ? geodataLoaderMemconservative
+                    : geodataLoaderStandard;
+                appController.updateClashConfigDebounce();
+              },
+            ),
+          );
+        },
+      ),
+      Selector<ClashConfig, bool>(
+        selector: (_, clashConfig) => clashConfig.externalController.isNotEmpty,
+        builder: (_, hasExternalController, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.api_outlined),
+            title: Text(appLocalizations.externalController),
+            subtitle: Text(appLocalizations.externalControllerDesc),
+            delegate: SwitchDelegate(
+              value: hasExternalController,
+              onChanged: (bool value) async {
+                final appController = globalState.appController;
+                appController.clashConfig.externalController =
+                    value ? defaultExternalController : '';
+                appController.updateClashConfigDebounce();
+              },
             ),
           );
         },
       ),
     ];
-    return ListView.separated(
+    return Section(
+      title: appLocalizations.general,
+      child: Column(
+        children: [
+          for (final item in items) ...[
+            item,
+            if (items.last != item)
+              const Divider(
+                height: 0,
+              )
+          ]
+        ],
+      ),
+    );
+  }
+
+  Widget _buildMoreSection() {
+    final items = [
+      if (false)
+        Selector<ClashConfig, bool>(
+          selector: (_, clashConfig) => clashConfig.tun.enable,
+          builder: (_, tunEnable, __) {
+            return ListItem.switchItem(
+              leading: const Icon(
+                Icons.important_devices_outlined
+              ),
+              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();
+                },
+              ),
+            );
+          },
+        ),
+    ];
+    if(items.isEmpty) return Container();
+    return Section(
+      title: appLocalizations.general,
+      child: Column(
+        children: [
+          for (final item in items) ...[
+            item,
+            if (items.last != item)
+              const Divider(
+                height: 0,
+              )
+          ]
+        ],
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    List<Widget> items = [
+      _buildAppSection(),
+      _buildGeneralSection(),
+      _buildMoreSection(),
+    ];
+    return ListView.builder(
+      padding: const EdgeInsets.only(bottom: 32),
       itemBuilder: (_, index) {
         return Container(
-          height: 84,
           alignment: Alignment.center,
           child: items[index],
         );
       },
-      separatorBuilder: (_, __) {
-        return const Divider(
-          height: 0,
-        );
-      },
       itemCount: items.length,
     );
   }

lib/fragments/connections.dart

@@ -1,140 +1,140 @@
-import 'dart:async';
+// import 'dart:async';
-
+//
-import 'package:fl_clash/clash/core.dart';
+// import 'package:fl_clash/clash/core.dart';
-import 'package:fl_clash/models/models.dart';
+// import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/plugins/app.dart';
+// import 'package:fl_clash/plugins/app.dart';
-import 'package:fl_clash/state.dart';
+// import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/widgets.dart';
+// import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
+// import 'package:flutter/material.dart';
-
+//
-class ConnectionsFragment extends StatefulWidget {
+// class ConnectionsFragment extends StatefulWidget {
-  const ConnectionsFragment({super.key});
+//   const ConnectionsFragment({super.key});
-
+//
-  @override
+//   @override
-  State<ConnectionsFragment> createState() => _ConnectionsFragmentState();
+//   State<ConnectionsFragment> createState() => _ConnectionsFragmentState();
-}
+// }
-
+//
-class _ConnectionsFragmentState extends State<ConnectionsFragment> {
+// class _ConnectionsFragmentState extends State<ConnectionsFragment> {
-  final connectionsNotifier = ValueNotifier<List<Connection>>([]);
+//   final connectionsNotifier = ValueNotifier<List<Connection>>([]);
-  Map<String, String?> idPackageNameMap = {};
+//   Map<String, String?> idPackageNameMap = {};
-
+//
-  Timer? timer;
+//   Timer? timer;
-
+//
-  @override
+//   @override
-  void initState() {
+//   void initState() {
-    super.initState();
+//     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+//     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-      _getConnections();
+//       _getConnections();
-      if (timer != null) {
+//       if (timer != null) {
-        timer?.cancel();
+//         timer?.cancel();
-        timer = null;
+//         timer = null;
-      }
+//       }
-      timer = Timer.periodic(const Duration(seconds: 3), (timer) {
+//       timer = Timer.periodic(const Duration(seconds: 3), (timer) {
-        if (mounted) {
+//         if (mounted) {
-          _getConnections();
+//           _getConnections();
-        }
+//         }
-      });
+//       });
-    });
+//     });
-  }
+//   }
-
+//
-  _getConnections() {
+//   _getConnections() {
-    connectionsNotifier.value = clashCore
+//     connectionsNotifier.value = clashCore
-        .getConnections();
+//         .getConnections();
-  }
+//   }
-
+//
-  @override
+//   @override
-  void dispose() {
+//   void dispose() {
-    super.dispose();
+//     super.dispose();
-    timer?.cancel();
+//     timer?.cancel();
-    timer = null;
+//     timer = null;
-  }
+//   }
-
+//
-  Future<ImageProvider?> _getPackageIconWithConnection(
+//   Future<ImageProvider?> _getPackageIconWithConnection(
-      Connection connection) async {
+//       Connection connection) async {
-    final uid = connection.metadata.uid;
+//     final uid = connection.metadata.uid;
-    // if(globalState.packageNameMap[uid] == null){
+//     // if(globalState.packageNameMap[uid] == null){
-    //   globalState.packageNameMap[uid] = await app?.getPackageName(connection.metadata);
+//     //   globalState.packageNameMap[uid] = await app?.getPackageName(connection.metadata);
-    // }
+//     // }
-    final packageName = globalState.packageNameMap[uid];
+//     final packageName = globalState.packageNameMap[uid];
-    if(packageName == null) return null;
+//     if(packageName == null) return null;
-    return await app?.getPackageIcon(packageName);
+//     return await app?.getPackageIcon(packageName);
-  }
+//   }
-
+//
-  @override
+//   @override
-  Widget build(BuildContext context) {
+//   Widget build(BuildContext context) {
-    return ValueListenableBuilder<List<Connection>>(
+//     return ValueListenableBuilder<List<Connection>>(
-      valueListenable: connectionsNotifier,
+//       valueListenable: connectionsNotifier,
-      builder: (_, List<Connection> connections, __) {
+//       builder: (_, List<Connection> connections, __) {
-        if (connections.isEmpty) {
+//         if (connections.isEmpty) {
-          return const NullStatus(
+//           return const NullStatus(
-            label: "未开启代理,或者没有连接数据",
+//             label: "未开启代理,或者没有连接数据",
-          );
+//           );
-        }
+//         }
-        return ListView.separated(
+//         return ListView.separated(
-          physics: const AlwaysScrollableScrollPhysics(),
+//           physics: const AlwaysScrollableScrollPhysics(),
-          itemBuilder: (_, index) {
+//           itemBuilder: (_, index) {
-            final connection = connections[index];
+//             final connection = connections[index];
-            return ListTile(
+//             return ListTile(
-              titleAlignment: ListTileTitleAlignment.top,
+//               titleAlignment: ListTileTitleAlignment.top,
-              leading: Container(
+//               leading: Container(
-                margin: const EdgeInsets.only(top: 4),
+//                 margin: const EdgeInsets.only(top: 4),
-                width: 48,
+//                 width: 48,
-                height: 48,
+//                 height: 48,
-                child: FutureBuilder<ImageProvider?>(
+//                 child: FutureBuilder<ImageProvider?>(
-                  future: _getPackageIconWithConnection(connection),
+//                   future: _getPackageIconWithConnection(connection),
-                  builder: (_, snapshot) {
+//                   builder: (_, snapshot) {
-                    if (!snapshot.hasData && snapshot.data == null) {
+//                     if (!snapshot.hasData && snapshot.data == null) {
-                      return Container();
+//                       return Container();
-                    } else {
+//                     } else {
-                      return Image(
+//                       return Image(
-                        image: snapshot.data!,
+//                         image: snapshot.data!,
-                        gaplessPlayback: true,
+//                         gaplessPlayback: true,
-                        width: 48,
+//                         width: 48,
-                        height: 48,
+//                         height: 48,
-                      );
+//                       );
-                    }
+//                     }
-                  },
+//                   },
-                ),
+//                 ),
-              ),
+//               ),
-              contentPadding:
+//               contentPadding:
-                  const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
+//                   const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
-              title: Column(
+//               title: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
+//                 crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
+//                 children: [
-                  Text(connection.metadata.host.isNotEmpty
+//                   Text(connection.metadata.host.isNotEmpty
-                      ? connection.metadata.host
+//                       ? connection.metadata.host
-                      : connection.metadata.destinationIP),
+//                       : connection.metadata.destinationIP),
-                  Padding(
+//                   Padding(
-                    padding: const EdgeInsets.only(
+//                     padding: const EdgeInsets.only(
-                      top: 12,
+//                       top: 12,
-                    ),
+//                     ),
-                    child: Wrap(
+//                     child: Wrap(
-                      runSpacing: 8,
+//                       runSpacing: 8,
-                      spacing: 8,
+//                       spacing: 8,
-                      children: [
+//                       children: [
-                        for (final chain in connection.chains)
+//                         for (final chain in connection.chains)
-                          CommonChip(
+//                           CommonChip(
-                            label: chain,
+//                             label: chain,
-                          ),
+//                           ),
-                      ],
+//                       ],
-                    ),
+//                     ),
-                  ),
+//                   ),
-                ],
+//                 ],
-              ),
+//               ),
-              trailing: IconButton(
+//               trailing: IconButton(
-                icon: const Icon(Icons.block),
+//                 icon: const Icon(Icons.block),
-                onPressed: () {},
+//                 onPressed: () {},
-              ),
+//               ),
-            );
+//             );
-          },
+//           },
-          separatorBuilder: (BuildContext context, int index) {
+//           separatorBuilder: (BuildContext context, int index) {
-            return const Divider(
+//             return const Divider(
-              height: 0,
+//               height: 0,
-            );
+//             );
-          },
+//           },
-          itemCount: connections.length,
+//           itemCount: connections.length,
-        );
+//         );
-      },
+//       },
-    );
+//     );
-  }
+//   }
-}
+// }

lib/fragments/dashboard/core_info.dart

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

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) {
+    return FloatLayout(
-      if (container.maxWidth < 200) return Container();
+      floatingWidget: const FloatWrapper(
-      return FloatLayout(
+        child: StartButton(),
-        floatingWidget: const FloatWrapper(
+      ),
-          child: StartButton(),
+      child: Align(
-        ),
+        alignment: Alignment.topCenter,
-        child: Align(
+        child: SingleChildScrollView(
-          alignment: Alignment.topCenter,
+          padding: const EdgeInsets.all(16),
-          child: SlotLayout(
+          child: Selector<AppState, ViewMode>(
-            config: {
+            selector: (_, appState) => appState.viewMode,
-              Breakpoints.small: SlotLayout.from(
+            builder: (_, viewMode, ___) {
-                key: const Key('dashboard_small'),
+              final isDesktop = viewMode == ViewMode.desktop;
-                builder: (_) => _buildGrid(false),
+              return Grid(
-              ),
+                crossAxisCount: 12,
-              Breakpoints.mediumAndUp: SlotLayout.from(
+                crossAxisSpacing: 16,
-                key: const Key('dashboard_mediumAndUp'),
+                mainAxisSpacing: 16,
-                builder: (_) => _buildGrid(true),
+                children: [
-              ),
+                  GridItem(
+                    crossAxisCellCount: isDesktop ? 8 : 12,
+                    child: const NetworkSpeed(),
+                  ),
+                  GridItem(
+                    crossAxisCellCount: isDesktop ? 4 : 6,
+                    child: const OutboundMode(),
+                  ),
+                  GridItem(
+                    crossAxisCellCount: isDesktop ? 4 : 6,
+                    child: const NetworkDetection(),
+                  ),
+                  GridItem(
+                    crossAxisCellCount: isDesktop ? 4 : 6,
+                    child: const TrafficUsage(),
+                  ),
+                  GridItem(
+                    crossAxisCellCount: isDesktop ? 4 : 6,
+                    child: const CoreInfo(),
+                  ),
+                ],
+              );
             },
           ),
         ),
-      );
+      ),
-    });
+    );
   }
 }

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,111 +15,45 @@ class NetworkDetection extends StatefulWidget {
 }
 
 class _NetworkDetectionState extends State<NetworkDetection> {
-  Widget _buildDescription(String? currentProxyName, int? delay) {
+  final ipInfoNotifier = ValueNotifier<IpInfo?>(null);
-    if (currentProxyName == null) {
+  final timeoutNotifier = ValueNotifier<bool>(false);
-      return TooltipText(
+  bool? _preIsStart;
-        text: Text(
+  CancelToken? cancelToken;
-          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,
-          ),
-    );
-  }
 
-  _updateCurrentDelay(
+  _checkIp(
-    String? currentProxyName,
-    int? delay,
-    bool isCurrent,
     bool isInit,
-  ) {
+    bool isStart,
-    if (!isCurrent || currentProxyName == null || !isInit) return;
+  ) async {
-    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+    if (!isInit) return;
-      if (delay == null) {
+    timeoutNotifier.value = false;
-        context.appController.setDelay(
+    if (_preIsStart == false && _preIsStart == isStart) return;
-          Delay(
+    if (cancelToken != null) {
-            name: currentProxyName,
+      cancelToken!.cancel();
-            value: 0,
+      cancelToken = null;
-          ),
+    }
-        );
+    ipInfoNotifier.value = null;
-        globalState.updateCurrentDelay(
+    final ipInfo = await request.checkIp(cancelToken);
-          currentProxyName,
+    if (ipInfo == null) {
-        );
+      timeoutNotifier.value = true;
-      }
+      return;
-    });
+    } else {
+      timeoutNotifier.value = false;
+    }
+    _preIsStart = isStart;
+    ipInfoNotifier.value = ipInfo;
   }
 
-  _updateCurrentDelayContainer(Widget child) {
+  _checkIpContainer(Widget child) {
-    return Selector3<AppState, Config, ClashConfig,
+    return Selector2<AppState, Config, CheckIpSelectorState>(
-        UpdateCurrentDelaySelectorState>(
+      selector: (_, appState, config) {
-      selector: (_, appState, config, clashConfig) {
+        return CheckIpSelectorState(
-        final proxyName = appState.getCurrentProxyName(
-          config.currentProxyName,
-          clashConfig.mode,
-        );
-        return UpdateCurrentDelaySelectorState(
           isInit: appState.isInit,
-          currentProxyName: proxyName,
+          selectedMap: appState.selectedMap,
-          delay: appState.delayMap[proxyName],
+          isStart: appState.isStart,
-          isCurrent: appState.currentLabel == 'dashboard',
         );
       },
       builder: (_, state, __) {
-        debugPrint("[UpdateCurrentDelay] update===>");
+        _checkIp(state.isInit, state.isStart);
-        _updateCurrentDelay(
-          state.currentProxyName,
-          state.delay,
-          state.isCurrent,
-          state.isInit,
-        );
         return child;
       },
       child: child,
@@ -126,64 +62,119 @@ class _NetworkDetectionState extends State<NetworkDetection> {
 
   @override
   Widget build(BuildContext context) {
-    return CommonCard(
+    return _checkIpContainer(
-      info: Info(
+      ValueListenableBuilder<IpInfo?>(
-        iconData: Icons.network_check,
+        valueListenable: ipInfoNotifier,
-        label: appLocalizations.networkDetection,
+        builder: (_, ipInfo, __) {
-      ),
+          return CommonCard(
-      child: _updateCurrentDelayContainer(
+            child: Column(
-        Selector3<AppState, Config, ClashConfig, NetworkDetectionSelectorState>(
+              children: [
-          selector: (_, appState, config, clashConfig) {
+                Flexible(
-            final proxyName = appState.getCurrentProxyName(
+                  flex: 0,
-              config.currentProxyName,
+                  child: Container(
-              clashConfig.mode,
+                    padding: const EdgeInsets.all(16),
-            );
+                    child: Row(
-            return NetworkDetectionSelectorState(
+                      children: [
-              isInit: appState.isInit,
+                        Icon(
-              currentProxyName: proxyName,
+                          Icons.network_check,
-              delay: appState.delayMap[proxyName],
+                          color: Theme.of(context).colorScheme.primary,
-            );
-          },
-          builder: (_, state, __) {
-            debugPrint("[NetworkDetection] update===>");
-            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: context.appController.measure.titleLargeHeight,
-                      alignment: Alignment.centerLeft,
-                      child: FadeBox(
-                        child: _buildDescription(
-                          state.currentProxyName,
-                          state.delay,
                         ),
-                      ),
+                        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(
+                                  "timeout",
+                                  style: context.textTheme.titleMedium
+                                      ?.copyWith(color: Colors.red)
+                                      .toSoftBold(),
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis,
+                                );
+                              }
+                              return Container(
+                                padding: const EdgeInsets.all(2),
+                                child: const AspectRatio(
+                                  aspectRatio: 1,
+                                  child: CircularProgressIndicator(),
+                                ),
+                              );
+                            },
+                          ),
+                  ),
+                )
+              ],
+            ),
+          );
+        },
       ),
     );
   }

lib/fragments/dashboard/network_speed.dart

@@ -1,5 +1,6 @@
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -20,26 +21,17 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
         .asMap()
         .map(
           (index, e) => MapEntry(
-        index,
+            index,
-        Point(
+            Point(
-          (index + initPoints.length).toDouble(),
+              (index + initPoints.length).toDouble(),
-          e.speed.toDouble(),
+              e.speed.toDouble(),
-        ),
+            ),
-      ),
+          ),
-    )
+        )
         .values
         .toList();
-    var pointsRaw = [...initPoints, ...trafficPoints];
-    List<Point> points;
-    if (pointsRaw.length > 60) {
-      points = pointsRaw
-          .getRange(pointsRaw.length - 61, pointsRaw.length - 1)
-          .toList();
-    } else {
-      points = pointsRaw;
-    }
 
-    return points;
+    return [...initPoints, ...trafficPoints];
   }
 
   Traffic _getLastTraffic(List<Traffic> traffics) {
@@ -52,11 +44,10 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
     required IconData iconData,
     required TrafficValue value,
   }) {
-
     final showValue = value.showValue;
     final showUnit = "${value.showUnit}/s";
     final titleLargeSoftBold =
-    Theme.of(context).textTheme.titleLarge?.toSoftBold();
+        Theme.of(context).textTheme.titleLarge?.toSoftBold();
     final bodyMedium = Theme.of(context).textTheme.bodySmall?.toLight();
     final valueText = Text(
       showValue,
@@ -68,7 +59,7 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
       style: bodyMedium,
       maxLines: 1,
     );
-    final size = context.appController.measure.computeTextSize(valueText);
+    final size = globalState.appController.measure.computeTextSize(valueText);
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.center,
@@ -120,7 +111,7 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
   @override
   Widget build(BuildContext context) {
     return CommonCard(
-      info:  Info(
+      info: Info(
         label: appLocalizations.networkSpeed,
         iconData: Icons.speed,
       ),
@@ -171,4 +162,4 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
       ),
     );
   }
-}
+}

lib/fragments/dashboard/outbound_mode.dart

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

lib/fragments/dashboard/start_button.dart

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

lib/fragments/dashboard/traffic_usage.dart

@@ -55,21 +55,11 @@ class TrafficUsage extends StatelessWidget {
         label: appLocalizations.trafficUsage,
         iconData: Icons.data_saver_off,
       ),
-      child: Selector<AppState, List<Traffic>>(
+      child: Selector<AppState, Traffic>(
-        selector: (_, appState) => appState.traffics,
+        selector: (_, appState) => appState.totalTraffic,
-        builder: (_, traffics, __) {
+        builder: (_, totalTraffic, __) {
-          final trafficTotal = traffics.isNotEmpty
+          final upTotalTrafficValue = totalTraffic.up;
-              ? traffics.reduce(
+          final downTotalTrafficValue = totalTraffic.down;
-                  (value, element) {
-                    return Traffic(
-                      up: element.up.value + value.up.value,
-                      down: element.down.value + value.down.value,
-                    );
-                  },
-                )
-              : Traffic();
-          final upTrafficValue = trafficTotal.up;
-          final downTrafficValue = trafficTotal.down;
           return Padding(
             padding: const EdgeInsets.all(16).copyWith(top: 0),
             child: Column(
@@ -80,7 +70,7 @@ class TrafficUsage extends StatelessWidget {
                   child: getTrafficDataItem(
                     context,
                     Icons.arrow_upward,
-                    upTrafficValue,
+                    upTotalTrafficValue,
                   ),
                 ),
                 const SizedBox(
@@ -91,7 +81,7 @@ class TrafficUsage extends StatelessWidget {
                   child: getTrafficDataItem(
                     context,
                     Icons.arrow_downward,
-                    downTrafficValue,
+                    downTotalTrafficValue,
                   ),
                 ),
               ],

lib/fragments/fragments.dart

@@ -7,4 +7,7 @@ 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';
+export 'requests.dart';

lib/fragments/logs.dart

@@ -1,6 +1,9 @@
 import 'dart:async';
 
+import 'package:collection/collection.dart';
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../models/models.dart';
@@ -20,15 +23,20 @@ class _LogsFragmentState extends State<LogsFragment> {
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
-      logsNotifier.value = context.read<AppState>().logs;
+      final appState = globalState.appController.appState;
+      logsNotifier.value = List<Log>.from(appState.logs);
       if (timer != null) {
         timer?.cancel();
         timer = null;
       }
-      timer = Timer.periodic(const Duration(seconds: 3), (timer) {
+      timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
-        if (mounted) {
+        final logs = List<Log>.from(appState.logs);
-          logsNotifier.value = context.read<AppState>().logs;
+        if (!const ListEquality<Log>().equals(
+          logsNotifier.value,
+          logs,
+        )) {
+          logsNotifier.value = logs;
         }
       });
     });
@@ -56,6 +64,9 @@ class _LogsFragmentState extends State<LogsFragment> {
             );
           },
           icon: const Icon(Icons.search),
+        ),
+        const SizedBox(
+          width: 8,
         )
       ];
     });
@@ -95,7 +106,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 +126,16 @@ class LogsSearchDelegate extends SearchDelegate {
     required this.logs,
   });
 
-  List<Log> get _results => logs
+  List<Log> get _results {
-      .where(
+    final lowQuery = query.toLowerCase();
-        (log) =>
+    return logs
-            (log.payload?.contains(query) ?? false) ||
+        .where(
-            log.logLevel.name.contains(query),
+          (log) =>
-      )
+              (log.payload?.toLowerCase().contains(lowQuery) ?? false) ||
-      .toList();
+              log.logLevel.name.contains(lowQuery),
+        )
+        .toList();
+  }
 
   @override
   List<Widget>? buildActions(BuildContext context) {
@@ -135,6 +150,9 @@ class LogsSearchDelegate extends SearchDelegate {
         },
         icon: const Icon(Icons.clear),
       ),
+      const SizedBox(
+        width: 8,
+      )
     ];
   }
 
@@ -161,6 +179,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/add_profile.dart

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

lib/fragments/profiles/edit_profile.dart

@@ -1,5 +1,7 @@
 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';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -38,8 +40,8 @@ class _EditProfileState extends State<EditProfile> {
 
   _handleConfirm() {
     if (!_formKey.currentState!.validate()) return;
-    final config = context.read<Config>();
+    final config = widget.context.read<Config>();
-    final hasUpdate = widget.profile.url != urlController.text;
+    final hasUpdate = urlController.text.isNotEmpty && widget.profile.url != urlController.text;
     widget.profile.url = urlController.text;
     widget.profile.label = labelController.text;
     widget.profile.autoUpdate = autoUpdate;
@@ -48,7 +50,7 @@ class _EditProfileState extends State<EditProfile> {
     config.setProfile(widget.profile);
     if (hasUpdate) {
       widget.context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
-            () => context.appController.updateProfile(
+            () => globalState.appController.updateProfile(
               widget.profile.id,
             ),
           );
@@ -81,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(),
@@ -149,6 +152,7 @@ class _EditProfileState extends State<EditProfile> {
             vertical: 16,
           ),
           child: ListView.separated(
+            primary: true,
             itemBuilder: (_, index) {
               return items[index];
             },

lib/fragments/profiles/profiles.dart

@@ -1,9 +1,11 @@
+import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/fragments/profiles/edit_profile.dart';
+import 'package:fl_clash/fragments/profiles/view_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';
@@ -14,6 +16,7 @@ enum ProfileActions {
   edit,
   update,
   delete,
+  view,
 }
 
 class ProfilesFragment extends StatefulWidget {
@@ -24,165 +27,169 @@ class ProfilesFragment extends StatefulWidget {
 }
 
 class _ProfilesFragmentState extends State<ProfilesFragment> {
-  String _getLastUpdateTimeDifference(DateTime lastDateTime) {
+  final hasPadding = ValueNotifier<bool>(false);
-    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 {
-    context.appController.deleteProfile(id);
-  }
-
-  _handleUpdateProfile(String id) async {
-    context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
-          () => context.appController.updateProfile(id),
-        );
-  }
-
-  Widget _profileItem({
-    required Profile profile,
-    required String? groupValue,
-    required void Function(String? value) onChanged,
-  }) {
-    String useShow;
-    String 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(),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
 
   _handleShowAddExtendPage() {
     showExtendPage(
-      context,
+      globalState.navigatorKey.currentState!.context,
       body: AddProfile(
-        context: context,
+        context: globalState.navigatorKey.currentState!.context,
       ),
       title: "${appLocalizations.add}${appLocalizations.profile}",
     );
   }
 
-  _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.sync),
+          ),
+          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(
@@ -193,25 +200,87 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
     );
   }
 
-  _buildGrid({
+  _handleViewProfile(Profile profile) {
-    required ProfilesSelectorState state,
+    Navigator.of(context).push(
-    int crossAxisCount = 1,
+      MaterialPageRoute(
-  }) {
+        builder: (context) => ViewProfile(
-    return SingleChildScrollView(
+          profile: profile.copyWith(),
-      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
+        ? appLocalizations.infiniteTime
+        : 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)
+          Row(
-            GridItem(
+            mainAxisSize: MainAxisSize.max,
-              child: _profileItem(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                profile: profile,
+            children: [
-                groupValue: state.currentProfileId,
+              Text(
-                onChanged: context.appController.changeProfile,
+                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(
+                    appLocalizations.expirationTime,
+                    style: textTheme.labelMedium?.toLighter(),
+                  ),
+                  const SizedBox(
+                    width: 4,
+                  ),
+                  Text(
+                    expireShow,
+                    style: textTheme.labelMedium?.toLighter(),
+                  ),
+                ],
+              )
+            ],
+          ),
         ],
       ),
     );
@@ -219,56 +288,73 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
 
   @override
   Widget build(BuildContext context) {
-    return FloatLayout(
+    final profile = widget.profile;
-      floatingWidget: Container(
+    final groupValue = widget.groupValue;
-        margin: const EdgeInsets.all(kFloatingActionButtonMargin),
+    final onChanged = widget.onChanged;
-        child: FloatingActionButton(
+    return Selector<AppState, ViewMode>(
-          heroTag: null,
+      selector: (_, appState) => appState.viewMode,
-          onPressed: _handleShowAddExtendPage,
+      builder: (_, viewMode, child) {
-          child: const Icon(Icons.add),
+        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,
         ),
-      ),
+        padding: const EdgeInsets.symmetric(horizontal: 16),
-      child: Selector<Config, ProfilesSelectorState>(
+        trailing: CommonPopupMenu<ProfileActions>(
-        selector: (_, config) => ProfilesSelectorState(
+          items: [
-          profiles: config.profiles,
+            CommonPopupMenuItem(
-          currentProfileId: config.currentProfileId,
+              action: ProfileActions.edit,
-        ),
+              label: appLocalizations.edit,
-        builder: (context, state, child) {
+              iconData: Icons.edit,
-          debugPrint("[Profiles] update===>");
-          if (state.profiles.isEmpty) {
-            return NullStatus(
-              label: appLocalizations.nullProfileDesc,
-            );
-          }
-          return Align(
-            alignment: Alignment.topCenter,
-            child: SlotLayout(
-              config: {
-                Breakpoints.small: SlotLayout.from(
-                  key: const Key('profiles_grid_small'),
-                  builder: (_) => _buildGrid(
-                    state: state,
-                    crossAxisCount: 1,
-                  ),
-                ),
-                Breakpoints.medium: SlotLayout.from(
-                  key: const Key('profiles_grid_medium'),
-                  builder: (_) => _buildGrid(
-                    state: state,
-                    crossAxisCount: 1,
-                  ),
-                ),
-                Breakpoints.large: SlotLayout.from(
-                  key: const Key('profiles_grid_large'),
-                  builder: (_) => _buildGrid(
-                    state: state,
-                    crossAxisCount: 2,
-                  ),
-                ),
-              },
             ),
-          );
+            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,
+            ),
+            // CommonPopupMenuItem(
+            //   action: ProfileActions.view,
+            //   label: "查看",
+            //   iconData: Icons.visibility,
+            // ),
+          ],
+          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 ProfileActions.view:
+                _handleViewProfile(profile);
+                break;
+              case null:
+                break;
+            }
+          },
+        ),
+        title: _buildTitle(profile),
+        tileTitleAlignment: ListTileTitleAlignment.titleHeight,
       ),
     );
   }

lib/fragments/profiles/view_profile.dart

@@ -0,0 +1,171 @@
+import 'dart:io';
+
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/widgets/scaffold.dart';
+import 'package:flutter/material.dart';
+import 'package:re_editor/re_editor.dart';
+import 'package:re_highlight/languages/yaml.dart';
+import 'package:re_highlight/styles/intellij-light.dart';
+
+class ViewProfile extends StatefulWidget {
+  final Profile profile;
+
+  const ViewProfile({
+    super.key,
+    required this.profile,
+  });
+
+  @override
+  State<ViewProfile> createState() => _ViewProfileState();
+}
+
+class _ViewProfileState extends State<ViewProfile> {
+  bool readOnly = true;
+  final controller = CodeLineEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      final profilePath = await appPath.getProfilePath(widget.profile.id);
+      if (profilePath == null) {
+        return;
+      }
+      final file = File(profilePath);
+      final text = await file.readAsString();
+      controller.text = text;
+      // _codeController.text = text;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return CommonScaffold(
+      actions: [
+        IconButton(
+          onPressed: controller.undo,
+          icon: const Icon(Icons.undo),
+        ),
+        IconButton(
+          onPressed: controller.redo,
+          icon: const Icon(Icons.redo),
+        ),
+        const SizedBox(
+          width: 8,
+        )
+      ],
+      body: CodeEditor(
+        autofocus: false,
+        readOnly: readOnly,
+        scrollbarBuilder: (context, child, details) {
+          return Scrollbar(
+            controller: details.controller,
+            thumbVisibility: true,
+            interactive: true,
+            child: child,
+          );
+        },
+        showCursorWhenReadOnly: false,
+        controller: controller,
+        toolbarController: const ContextMenuControllerImpl(),
+        shortcutsActivatorsBuilder:
+            const DefaultCodeShortcutsActivatorsBuilder(),
+        indicatorBuilder:
+            (context, editingController, chunkController, notifier) {
+          return Row(
+            children: [
+              DefaultCodeLineNumber(
+                controller: editingController,
+                notifier: notifier,
+              ),
+              DefaultCodeChunkIndicator(
+                width: 20,
+                controller: chunkController,
+                notifier: notifier,
+              )
+            ],
+          );
+        },
+        style: CodeEditorStyle(
+          fontSize: 14,
+          codeTheme: CodeHighlightTheme(
+            languages: {
+              'yaml': CodeHighlightThemeMode(
+                mode: langYaml,
+              )
+            },
+            theme: intellijLightTheme,
+          ),
+        ),
+      ),
+      title: "查看",
+      floatingActionButton: FloatingActionButton(
+        onPressed: () {
+          setState(() {
+            readOnly = !readOnly;
+          });
+        },
+        child: readOnly ? const Icon(Icons.edit) : const Icon(Icons.save),
+      ),
+    );
+  }
+}
+
+class ContextMenuItemWidget extends PopupMenuItem<void> {
+  ContextMenuItemWidget({
+    super.key,
+    required String text,
+    required VoidCallback super.onTap,
+  }) : super(child: Text(text));
+}
+
+class ContextMenuControllerImpl implements SelectionToolbarController {
+  const ContextMenuControllerImpl();
+
+  @override
+  void hide(BuildContext context) {}
+
+  @override
+  void show({
+    required BuildContext context,
+    required CodeLineEditingController controller,
+    required TextSelectionToolbarAnchors anchors,
+    Rect? renderRect,
+    required LayerLink layerLink,
+    required ValueNotifier<bool> visibility,
+  }) {
+    if (controller.selectedText.isEmpty) {
+      return;
+    }
+    showMenu(
+      context: context,
+      popUpAnimationStyle: AnimationStyle.noAnimation,
+      position: RelativeRect.fromSize(
+        (anchors.secondaryAnchor ?? anchors.primaryAnchor) &
+            const Size(150, double.infinity),
+        MediaQuery.of(context).size,
+      ),
+      items: [
+        ContextMenuItemWidget(
+          text: 'Cut',
+          onTap: () {
+            controller.cut();
+          },
+        ),
+        ContextMenuItemWidget(
+          text: 'Copy',
+          onTap: () {
+            controller.copy();
+          },
+        ),
+        ContextMenuItemWidget(
+          text: 'Paste',
+          onTap: () {
+            controller.paste();
+          },
+        ),
+      ],
+    );
+  }
+}

lib/fragments/proxies.dart

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

lib/fragments/requests.dart

@@ -0,0 +1,178 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:collection/collection.dart';
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/plugins/app.dart';
+import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+
+class RequestFragment extends StatefulWidget {
+  const RequestFragment({super.key});
+
+  @override
+  State<RequestFragment> createState() => _RequestFragmentState();
+}
+
+class _RequestFragmentState extends State<RequestFragment> {
+  final requestsNotifier = ValueNotifier<List<Connection>>([]);
+  final ScrollController _scrollController = ScrollController(
+    keepScrollOffset: false,
+  );
+
+  Timer? timer;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final appState = globalState.appController.appState;
+      requestsNotifier.value = List<Connection>.from(appState.requests);
+      if (timer != null) {
+        timer?.cancel();
+        timer = null;
+      }
+      timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
+        final requests = List<Connection>.from(appState.requests);
+        if (!const ListEquality<Connection>().equals(
+          requestsNotifier.value,
+          requests,
+        )) {
+          requestsNotifier.value = requests;
+        }
+      });
+    });
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    timer?.cancel();
+    _scrollController.dispose();
+    timer = null;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ValueListenableBuilder<List<Connection>>(
+      valueListenable: requestsNotifier,
+      builder: (_, List<Connection> connections, __) {
+        if (connections.isEmpty) {
+          return NullStatus(
+            label: appLocalizations.nullRequestsDesc,
+          );
+        }
+        connections = connections.reversed.toList();
+        return ListView.separated(
+          controller: _scrollController,
+          itemBuilder: (_, index) {
+            final connection = connections[index];
+            return RequestItem(
+              key: Key(connection.id),
+              connection: connection,
+            );
+          },
+          separatorBuilder: (BuildContext context, int index) {
+            return const Divider(
+              height: 0,
+            );
+          },
+          itemCount: connections.length,
+        );
+      },
+    );
+  }
+}
+
+class RequestItem extends StatelessWidget {
+  final Connection connection;
+
+  const RequestItem({
+    super.key,
+    required this.connection,
+  });
+
+  Future<ImageProvider?> _getPackageIcon(Connection connection) async {
+    return await app?.getPackageIcon(connection.metadata.process);
+  }
+
+  String _getRequestText(Metadata metadata) {
+    var text = "${metadata.network}:://";
+    final ips = [
+      metadata.host,
+      metadata.destinationIP,
+    ].where((ip) => ip.isNotEmpty);
+    text += ips.join("/");
+    text += ":${metadata.destinationPort}";
+    return text;
+  }
+
+  String _getSourceText(Connection connection) {
+    final metadata = connection.metadata;
+    if (metadata.process.isEmpty) {
+      return connection.start.lastUpdateTimeDesc;
+    }
+    return "${metadata.process} · ${connection.start.lastUpdateTimeDesc}";
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      titleAlignment: ListTileTitleAlignment.top,
+      leading: Platform.isAndroid
+          ? Container(
+              margin: const EdgeInsets.only(top: 4),
+              width: 48,
+              height: 48,
+              child: FutureBuilder<ImageProvider?>(
+                future: _getPackageIcon(connection),
+                builder: (_, snapshot) {
+                  if (!snapshot.hasData && snapshot.data == null) {
+                    return Container();
+                  } else {
+                    return Image(
+                      image: snapshot.data!,
+                      gaplessPlayback: true,
+                      width: 48,
+                      height: 48,
+                    );
+                  }
+                },
+              ),
+            )
+          : null,
+      title: Text(
+        _getRequestText(connection.metadata),
+      ),
+      subtitle: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const SizedBox(
+            height: 12,
+          ),
+          Text(
+            _getSourceText(connection),
+          ),
+          const SizedBox(
+            height: 12,
+          ),
+          Wrap(
+            runSpacing: 8,
+            spacing: 8,
+            children: [
+              for (final chain in connection.chains)
+                CommonChip(
+                  label: chain,
+                ),
+            ],
+          ),
+          const SizedBox(
+            height: 12,
+          ),
+        ],
+      ),
+    );
+  }
+}

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

@@ -1,5 +1,6 @@
 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:provider/provider.dart';
 
@@ -28,7 +29,7 @@ class ThemeFragment extends StatelessWidget {
     return CommonCard(
       isSelected: isSelected,
       onPressed: () {
-        context.appController.config.themeMode = themeModeItem.themeMode;
+        globalState.appController.config.themeMode = themeModeItem.themeMode;
       },
       child: Padding(
         padding: const EdgeInsets.symmetric(horizontal:16),
@@ -62,7 +63,7 @@ class ThemeFragment extends StatelessWidget {
       isSelected: isSelected,
       primaryColor: color,
       onPressed: () {
-        context.appController.config.primaryColor = color?.value;
+        globalState.appController.config.primaryColor = color?.value;
       },
     );
   }
@@ -108,11 +109,12 @@ class ThemeFragment extends StatelessWidget {
     ];
     List<Color?> primaryColors = [
       null,
-      appConstant.defaultPrimaryColor,
+      defaultPrimaryColor,
       Colors.pinkAccent,
+      Colors.lightBlue,
       Colors.greenAccent,
       Colors.yellowAccent,
-      Colors.purple
+      Colors.purple,
     ];
     return Column(
       children: [

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());
@@ -114,7 +88,7 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
         selector: (_, config) => config.locale,
         builder: (_, localeString, __) {
           final subTitle = localeString ?? appLocalizations.defaultText;
-          final currentLocale = Other.getLocaleForString(localeString);
+          final currentLocale = other.getLocaleForString(localeString);
           return ListTile(
             leading: const Icon(Icons.language_outlined),
             title: Text(appLocalizations.language),
@@ -161,9 +135,19 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
         title: Text(appLocalizations.theme),
         subtitle: Text(appLocalizations.themeDesc),
         delegate: OpenDelegate(
-            title: appLocalizations.theme,
+          title: appLocalizations.theme,
-            widget: const ThemeFragment(),
+          widget: const ThemeFragment(),
-            extendPageWidth: 360),
+          extendPageWidth: 360,
+        ),
+      ),
+      ListItem.open(
+        leading: const Icon(Icons.cloud_sync),
+        title: Text(appLocalizations.backupAndRecovery),
+        subtitle: Text(appLocalizations.backupAndRecoveryDesc),
+        delegate: OpenDelegate(
+          title: appLocalizations.backupAndRecovery,
+          widget: const BackupAndRecovery(),
+        ),
       ),
       if (Platform.isAndroid)
         ListItem.open(
@@ -182,6 +166,7 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
         delegate: OpenDelegate(
           title: appLocalizations.override,
           widget: const ConfigFragment(),
+          extendPageWidth: 360,
         ),
       ),
       ListItem.open(
@@ -210,44 +195,47 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
 
   @override
   Widget build(BuildContext context) {
-    final items = [
+    return Selector<Config, String?>(
-      LayoutBuilder(builder: (context, container) {
+      selector: (_, config) => config.locale,
-        final isMobile = context.isMobile;
+      builder: (_, __, ___) {
-        if (!isMobile) {
+        final items = [
-          return Container(
+          Selector<AppState, MoreToolsSelectorState>(
-            margin: const EdgeInsets.only(top: 18),
+            selector: (_, appState) {
-          );
+              return MoreToolsSelectorState(
-        }
+                navigationItems: appState.viewMode == ViewMode.mobile
-        return Selector<AppState, List<NavigationItem>>(
+                    ? appState.navigationItems.where(
-          selector: (_, appState) => appState.navigationItems,
+                        (element) {
-          builder: (_, navigationItems, __) {
+                          return element.modes
-            final moreNavigationItems = navigationItems
+                              .contains(NavigationItemMode.more);
-                .where(
+                        },
-                  (element) => element.modes.contains(NavigationItemMode.more),
+                      ).toList()
-                )
+                    : [],
-                .toList();
+              );
-            if (moreNavigationItems.isEmpty) {
+            },
-              return Container();
+            builder: (_, state, __) {
-            }
+              if (state.navigationItems.isEmpty) {
-            return _buildSection(
+                return Container();
-              title: appLocalizations.more,
+              }
-              content: _buildNavigationMenu(moreNavigationItems),
+              return Section(
-            );
+                title: appLocalizations.more,
-          },
+                child: _buildNavigationMenu(state.navigationItems),
+              );
+            },
+          ),
+          Section(
+            title: appLocalizations.settings,
+            child: _getSettingList(),
+          ),
+          Section(
+            title: appLocalizations.other,
+            child: _getOtherList(),
+          ),
+        ];
+        return ListView.builder(
+          itemCount: items.length,
+          itemBuilder: (_, index) => items[index],
         );
-      }),
+      },
-      _buildSection(
-        title: appLocalizations.settings,
-        content: _getSettingList(),
-      ),
-      _buildSection(
-        title: appLocalizations.other,
-        content: _getOtherList(),
-      ),
-    ];
-    return ListView.builder(
-      itemCount: items.length,
-      itemBuilder: (_, index) => items[index],
     );
   }
 }

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",
@@ -35,7 +37,7 @@
   "overrideDesc": "Override Proxy related config",
   "allowLan": "AllowLan",
   "allowLanDesc": "Allow access proxy through the LAN",
-  "tun": "Tun",
+  "tun": "Tun mode",
   "tunDesc": "only effective in administrator mode",
   "minimizeOnExit": "Minimize on exit",
   "minimizeOnExitDesc": "Modify the default system exit event",
@@ -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",
@@ -92,6 +96,7 @@
   "delaySort": "Sort by delay",
   "nameSort": "Sort by name",
   "pleaseUploadFile": "Please upload file",
+  "pleaseUploadValidQrcode": "Please upload a valid QR code",
   "blacklistMode": "Blacklist mode",
   "whitelistMode": "Whitelist mode",
   "filterSystemApp": "Filter system app",
@@ -106,6 +111,7 @@
   "noMoreInfoDesc": "No more info",
   "profileParseErrorDesc": "profile parse error",
   "proxyPort": "ProxyPort",
+  "proxyPortDesc": "Set the clash listening port",
   "port": "Port",
   "logLevel": "LogLevel",
   "show": "Show",
@@ -113,11 +119,70 @@
   "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.",
   "startVpn": "Staring VPN...",
   "stopVpn": "Stopping VPN...",
-  "discovery": "Discovery a new version"
+  "discovery": "Discovery a new version",
+  "compatible": "Compatibility mode",
+  "compatibleDesc": "Opening it will lose part of its application ability and gain the support of full amount of Clash.",
+  "notSelectedTip": "The current proxy group cannot be selected.",
+  "tip": "tip",
+  "backupAndRecovery": "Backup and Recovery",
+  "backupAndRecoveryDesc": "Sync data by WebDAV",
+  "account": "Account",
+  "backup": "Backup",
+  "backupDesc": "Backup local data to WebDAV",
+  "recovery": "Recovery",
+  "recoveryDesc": "Recovery data from WebDAV",
+  "recoveryProfiles": "Only recovery profiles",
+  "recoveryAll": "Recovery all data",
+  "recoverySuccess": "Recovery success",
+  "backupSuccess": "Backup success",
+  "noInfo": "No info",
+  "pleaseBindWebDAV": "Please bind WebDAV",
+  "bind": "Bind",
+  "connectivity": "Connectivity：",
+  "webDAVConfiguration": "WebDAV configuration",
+  "address": "Address",
+  "addressHelp": "WebDAV server address",
+  "addressTip": "Please enter a valid WebDAV address",
+  "password": "Password",
+  "passwordTip": "Password cannot be empty",
+  "accountTip": "Account cannot be empty",
+  "checkUpdate": "Check for updates",
+  "discoverNewVersion": "Discover the new version",
+  "checkUpdateError": "The current application is already the latest version",
+  "goDownload": "Go to download",
+  "unknown": "Unknown",
+  "geoData": "GeoData",
+  "externalResources": "External resources",
+  "checking": "Checking...",
+  "country": "Country",
+  "checkError": "Check error",
+  "ipCheckTimeout": "Ip check timeout",
+  "search": "Search",
+  "allowBypass": "Allow applications to bypass VPN",
+  "allowBypassDesc": "Some apps can bypass VPN when turned on",
+  "externalController": "ExternalController",
+  "externalControllerDesc": "Once enabled, the clash kernel can be controlled on port 9090",
+  "ipv6Desc": "When turned on it will be able to receive ipv6 traffic",
+  "app": "App",
+  "general": "General",
+  "systemProxyDesc": "Attach HTTP proxy to VpnService",
+  "unifiedDelay": "Unified delay",
+  "unifiedDelayDesc": "Remove extra delays such as handshaking",
+  "tcpConcurrent": "Tcp concurrent",
+  "tcpConcurrentDesc": "Enabling it will allow tcp concurrency",
+  "geodataLoader": "Geo Low Memory Mode",
+  "geodataLoaderDesc": "Enabling will use the Geo low memory loader",
+  "requests": "Requests",
+  "requestsDesc": "View recently requested data",
+  "nullRequestsDesc": "No proxy or no request",
+  "findProcessMode": "Find process",
+  "findProcessModeDesc": "There is a risk of flashback after opening",
+  "init": "Init",
+  "infiniteTime": "Long term effective",
+  "expirationTime": "Expiration time"
 }

lib/l10n/arb/intl_zh_CN.arb

@@ -9,6 +9,8 @@
   "tools": "工具",
   "logs": "日志",
   "logsDesc": "日志捕获记录",
+  "resources": "资源",
+  "resourcesDesc": "外部资源相关信息",
   "trafficUsage": "流量统计",
   "coreInfo": "内核信息",
   "nullCoreInfoDesc": "无法获取内核信息",
@@ -35,7 +37,7 @@
   "overrideDesc": "覆写代理相关配置",
   "allowLan": "局域网代理",
   "allowLanDesc": "允许通过局域网访问代理",
-  "tun": "虚拟网络设备",
+  "tun": "Tun模式",
   "tunDesc": "仅在管理员模式生效",
   "minimizeOnExit": "退出时最小化",
   "minimizeOnExitDesc": "修改系统默认退出事件",
@@ -47,6 +49,8 @@
   "autoRunDesc": "应用打开时自动运行",
   "logcat": "日志捕获",
   "logcatDesc": "禁用将会隐藏日志入口",
+  "autoCheckUpdate": "自动检查更新",
+  "autoCheckUpdateDesc": "应用启动时自动检查更新",
   "accessControl": "访问控制",
   "accessControlDesc": "配置应用访问代理",
   "application": "应用程序",
@@ -92,6 +96,7 @@
   "delaySort": "按延迟排序",
   "nameSort": "按名称排序",
   "pleaseUploadFile": "请上传文件",
+  "pleaseUploadValidQrcode": "请上传有效的二维码",
   "blacklistMode": "黑名单模式",
   "whitelistMode": "白名单模式",
   "filterSystemApp": "过滤系统应用",
@@ -106,6 +111,7 @@
   "noMoreInfoDesc": "暂无更多信息",
   "profileParseErrorDesc": "配置文件解析错误",
   "proxyPort": "代理端口",
+  "proxyPortDesc": "设置clash监听端口",
   "port": "端口",
   "logLevel": "日志等级",
   "show": "显示",
@@ -113,11 +119,70 @@
   "systemProxy": "系统代理",
   "project": "项目",
   "core": "内核",
-  "checkUpdate": "检查更新",
   "tabAnimation": "选项卡动画",
   "tabAnimationDesc": "开启后，主页选项卡将添加切换动画",
   "desc": "基于ClashMeta的多平台代理客户端，简单易用，开源无广告。",
   "startVpn": "正在启动VPN...",
   "stopVpn": "正在停止VPN...",
-  "discovery": "发现新版本"
+  "discovery": "发现新版本",
+  "compatible": "兼容模式",
+  "compatibleDesc": "开启将失去部分应用能力，获得全量的Clash的支持",
+  "notSelectedTip": "当前代理组无法选中",
+  "tip": "提示",
+  "backupAndRecovery": "备份与恢复",
+  "backupAndRecoveryDesc": "通过WebDAV同步数据",
+  "account": "账号",
+  "backup": "备份",
+  "backupDesc": "备份数据到WebDAV",
+  "recovery": "恢复",
+  "recoveryDesc": "从WebDAV恢复数据",
+  "recoveryProfiles": "仅恢复配置文件",
+  "recoveryAll": "恢复所有数据",
+  "recoverySuccess": "恢复成功",
+  "backupSuccess": "备份成功",
+  "noInfo": "暂无信息",
+  "pleaseBindWebDAV": "请绑定WebDAV",
+  "bind": "绑定",
+  "connectivity": "连通性：",
+  "webDAVConfiguration": "WebDAV配置",
+  "address": "地址",
+  "addressHelp": "WebDAV服务器地址",
+  "addressTip": "请输入有效的WebDAV地址",
+  "password": "密码",
+  "passwordTip": "密码不能为空",
+  "accountTip": "账号不能为空",
+  "checkUpdate": "检查更新",
+  "discoverNewVersion": "发现新版本",
+  "checkUpdateError": "当前应用已经是最新版了",
+  "goDownload": "前往下载",
+  "unknown": "未知",
+  "geoData": "地理数据",
+  "externalResources": "外部资源",
+  "checking": "检测中...",
+  "country": "区域",
+  "checkError": "检测失败",
+  "ipCheckTimeout": "Ip检测超时",
+  "search": "搜索",
+  "allowBypass": "允许应用绕过vpn",
+  "allowBypassDesc": "开启后部分应用可绕过VPN",
+  "externalController": "外部控制器",
+  "externalControllerDesc": "开启后将可以通过9090端口控制clash内核",
+  "ipv6Desc": "开启后将可以接收ipv6流量",
+  "app": "应用",
+  "general": "基础",
+  "systemProxyDesc": "为VpnService附加HTTP代理",
+  "unifiedDelay": "统一延迟",
+  "unifiedDelayDesc": "去除握手等额外延迟",
+  "tcpConcurrent": "TCP并发",
+  "tcpConcurrentDesc": "开启后允许tcp并发",
+  "geodataLoader": "Geo低内存模式",
+  "geodataLoaderDesc": "开启将使用Geo低内存加载器",
+  "requests": "请求",
+  "requestsDesc": "查看最近请求数据",
+  "nullRequestsDesc": "未开启代理或者没有请求",
+  "findProcessMode": "查找进程",
+  "findProcessModeDesc": "开启后存在闪退风险",
+  "init": "初始化",
+  "infiniteTime": "长期有效",
+  "expirationTime": "到期时间"
 }

lib/l10n/intl/messages_en.dart

@@ -30,17 +30,34 @@ 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"),
+        "allowBypass": MessageLookupByLibrary.simpleMessage(
+            "Allow applications to bypass VPN"),
+        "allowBypassDesc": MessageLookupByLibrary.simpleMessage(
+            "Some apps can bypass VPN when turned on"),
         "allowLan": MessageLookupByLibrary.simpleMessage("AllowLan"),
         "allowLanDesc": MessageLookupByLibrary.simpleMessage(
             "Allow access proxy through the LAN"),
+        "app": MessageLookupByLibrary.simpleMessage("App"),
         "appAccessControl":
             MessageLookupByLibrary.simpleMessage("App access control"),
         "application": MessageLookupByLibrary.simpleMessage("Application"),
         "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,15 +67,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"),
@@ -70,6 +107,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":
@@ -78,15 +117,40 @@ class MessageLookup extends MessageLookupByLibrary {
         "edit": MessageLookupByLibrary.simpleMessage("Edit"),
         "en": MessageLookupByLibrary.simpleMessage("English"),
         "exit": MessageLookupByLibrary.simpleMessage("Exit"),
+        "expirationTime":
+            MessageLookupByLibrary.simpleMessage("Expiration time"),
+        "externalController":
+            MessageLookupByLibrary.simpleMessage("ExternalController"),
+        "externalControllerDesc": MessageLookupByLibrary.simpleMessage(
+            "Once enabled, the clash kernel can be controlled on port 9090"),
+        "externalResources":
+            MessageLookupByLibrary.simpleMessage("External resources"),
         "file": MessageLookupByLibrary.simpleMessage("File"),
         "fileDesc":
             MessageLookupByLibrary.simpleMessage("Directly upload profile"),
         "filterSystemApp":
             MessageLookupByLibrary.simpleMessage("Filter system app"),
+        "findProcessMode": MessageLookupByLibrary.simpleMessage("Find process"),
+        "findProcessModeDesc": MessageLookupByLibrary.simpleMessage(
+            "There is a risk of flashback after opening"),
+        "general": MessageLookupByLibrary.simpleMessage("General"),
+        "geoData": MessageLookupByLibrary.simpleMessage("GeoData"),
+        "geodataLoader":
+            MessageLookupByLibrary.simpleMessage("Geo Low Memory Mode"),
+        "geodataLoaderDesc": MessageLookupByLibrary.simpleMessage(
+            "Enabling will use the Geo low memory loader"),
         "global": MessageLookupByLibrary.simpleMessage("Global"),
+        "goDownload": MessageLookupByLibrary.simpleMessage("Go to download"),
         "hours": MessageLookupByLibrary.simpleMessage("Hours"),
         "importFromURL":
             MessageLookupByLibrary.simpleMessage("Import from URL"),
+        "infiniteTime":
+            MessageLookupByLibrary.simpleMessage("Long term effective"),
+        "init": MessageLookupByLibrary.simpleMessage("Init"),
+        "ipCheckTimeout":
+            MessageLookupByLibrary.simpleMessage("Ip check timeout"),
+        "ipv6Desc": MessageLookupByLibrary.simpleMessage(
+            "When turned on it will be able to receive ipv6 traffic"),
         "just": MessageLookupByLibrary.simpleMessage("Just"),
         "language": MessageLookupByLibrary.simpleMessage("Language"),
         "light": MessageLookupByLibrary.simpleMessage("Light"),
@@ -108,22 +172,34 @@ 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(
             "Please create a profile or add a valid profile"),
+        "notSelectedTip": MessageLookupByLibrary.simpleMessage(
+            "The current proxy group cannot be selected."),
         "nullCoreInfoDesc":
             MessageLookupByLibrary.simpleMessage("Unable to obtain core info"),
         "nullLogsDesc": MessageLookupByLibrary.simpleMessage("No logs"),
         "nullProfileDesc": MessageLookupByLibrary.simpleMessage(
             "No profile, Please add a profile"),
+        "nullRequestsDesc":
+            MessageLookupByLibrary.simpleMessage("No proxy or no request"),
         "other": MessageLookupByLibrary.simpleMessage("Other"),
         "outboundMode": MessageLookupByLibrary.simpleMessage("Outbound mode"),
         "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(
+            "Please upload a valid QR code"),
         "port": MessageLookupByLibrary.simpleMessage("Port"),
         "preview": MessageLookupByLibrary.simpleMessage("Preview"),
         "profile": MessageLookupByLibrary.simpleMessage("Profile"),
@@ -145,11 +221,29 @@ class MessageLookup extends MessageLookupByLibrary {
         "project": MessageLookupByLibrary.simpleMessage("Project"),
         "proxies": MessageLookupByLibrary.simpleMessage("Proxies"),
         "proxyPort": MessageLookupByLibrary.simpleMessage("ProxyPort"),
+        "proxyPortDesc": MessageLookupByLibrary.simpleMessage(
+            "Set the clash listening port"),
         "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"),
+        "requests": MessageLookupByLibrary.simpleMessage("Requests"),
+        "requestsDesc": MessageLookupByLibrary.simpleMessage(
+            "View recently requested data"),
+        "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"),
@@ -161,27 +255,39 @@ class MessageLookup extends MessageLookupByLibrary {
         "stopVpn": MessageLookupByLibrary.simpleMessage("Stopping VPN..."),
         "submit": MessageLookupByLibrary.simpleMessage("Submit"),
         "systemProxy": MessageLookupByLibrary.simpleMessage("SystemProxy"),
+        "systemProxyDesc": MessageLookupByLibrary.simpleMessage(
+            "Attach HTTP proxy to VpnService"),
         "tabAnimation": MessageLookupByLibrary.simpleMessage("Tab animation"),
         "tabAnimationDesc": MessageLookupByLibrary.simpleMessage(
             "When enabled, the home tab will add a toggle animation"),
+        "tcpConcurrent": MessageLookupByLibrary.simpleMessage("Tcp concurrent"),
+        "tcpConcurrentDesc": MessageLookupByLibrary.simpleMessage(
+            "Enabling it will allow tcp concurrency"),
         "theme": MessageLookupByLibrary.simpleMessage("Theme"),
         "themeColor": MessageLookupByLibrary.simpleMessage("Theme color"),
         "themeDesc": MessageLookupByLibrary.simpleMessage(
             "Set dark mode,adjust the color"),
         "themeMode": MessageLookupByLibrary.simpleMessage("Theme mode"),
+        "tip": MessageLookupByLibrary.simpleMessage("tip"),
         "tools": MessageLookupByLibrary.simpleMessage("Tools"),
         "trafficUsage": MessageLookupByLibrary.simpleMessage("Traffic usage"),
-        "tun": MessageLookupByLibrary.simpleMessage("Tun"),
+        "tun": MessageLookupByLibrary.simpleMessage("Tun mode"),
         "tunDesc": MessageLookupByLibrary.simpleMessage(
             "only effective in administrator mode"),
         "unableToUpdateCurrentProfileDesc":
             MessageLookupByLibrary.simpleMessage(
                 "unable to update current profile"),
+        "unifiedDelay": MessageLookupByLibrary.simpleMessage("Unified delay"),
+        "unifiedDelayDesc": MessageLookupByLibrary.simpleMessage(
+            "Remove extra delays such as handshaking"),
+        "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,14 +29,26 @@ 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("前"),
+        "allowBypass": MessageLookupByLibrary.simpleMessage("允许应用绕过vpn"),
+        "allowBypassDesc":
+            MessageLookupByLibrary.simpleMessage("开启后部分应用可绕过VPN"),
         "allowLan": MessageLookupByLibrary.simpleMessage("局域网代理"),
         "allowLanDesc": MessageLookupByLibrary.simpleMessage("允许通过局域网访问代理"),
+        "app": MessageLookupByLibrary.simpleMessage("应用"),
         "appAccessControl": MessageLookupByLibrary.simpleMessage("应用访问控制"),
         "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,14 +56,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("仪表盘"),
@@ -63,18 +90,37 @@ 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("退出"),
+        "expirationTime": MessageLookupByLibrary.simpleMessage("到期时间"),
+        "externalController": MessageLookupByLibrary.simpleMessage("外部控制器"),
+        "externalControllerDesc":
+            MessageLookupByLibrary.simpleMessage("开启后将可以通过9090端口控制clash内核"),
+        "externalResources": MessageLookupByLibrary.simpleMessage("外部资源"),
         "file": MessageLookupByLibrary.simpleMessage("文件"),
         "fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
         "filterSystemApp": MessageLookupByLibrary.simpleMessage("过滤系统应用"),
+        "findProcessMode": MessageLookupByLibrary.simpleMessage("查找进程"),
+        "findProcessModeDesc":
+            MessageLookupByLibrary.simpleMessage("开启后存在闪退风险"),
+        "general": MessageLookupByLibrary.simpleMessage("基础"),
+        "geoData": MessageLookupByLibrary.simpleMessage("地理数据"),
+        "geodataLoader": MessageLookupByLibrary.simpleMessage("Geo低内存模式"),
+        "geodataLoaderDesc":
+            MessageLookupByLibrary.simpleMessage("开启将使用Geo低内存加载器"),
         "global": MessageLookupByLibrary.simpleMessage("全局"),
+        "goDownload": MessageLookupByLibrary.simpleMessage("前往下载"),
         "hours": MessageLookupByLibrary.simpleMessage("小时"),
         "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
+        "infiniteTime": MessageLookupByLibrary.simpleMessage("长期有效"),
+        "init": MessageLookupByLibrary.simpleMessage("初始化"),
+        "ipCheckTimeout": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
+        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收ipv6流量"),
         "just": MessageLookupByLibrary.simpleMessage("刚刚"),
         "language": MessageLookupByLibrary.simpleMessage("语言"),
         "light": MessageLookupByLibrary.simpleMessage("浅色"),
@@ -93,19 +139,27 @@ class MessageLookup extends MessageLookupByLibrary {
         "nameSort": MessageLookupByLibrary.simpleMessage("按名称排序"),
         "networkDetection": MessageLookupByLibrary.simpleMessage("网络检测"),
         "networkSpeed": MessageLookupByLibrary.simpleMessage("网络速度"),
+        "noInfo": MessageLookupByLibrary.simpleMessage("暂无信息"),
         "noMoreInfoDesc": MessageLookupByLibrary.simpleMessage("暂无更多信息"),
         "noProxy": MessageLookupByLibrary.simpleMessage("暂无代理"),
         "noProxyDesc":
             MessageLookupByLibrary.simpleMessage("请创建配置文件或者添加有效配置文件"),
+        "notSelectedTip": MessageLookupByLibrary.simpleMessage("当前代理组无法选中"),
         "nullCoreInfoDesc": MessageLookupByLibrary.simpleMessage("无法获取内核信息"),
         "nullLogsDesc": MessageLookupByLibrary.simpleMessage("暂无日志"),
         "nullProfileDesc":
             MessageLookupByLibrary.simpleMessage("没有配置文件,请先添加配置文件"),
+        "nullRequestsDesc": MessageLookupByLibrary.simpleMessage("未开启代理或者没有请求"),
         "other": MessageLookupByLibrary.simpleMessage("其他"),
         "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("请上传有效的二维码"),
         "port": MessageLookupByLibrary.simpleMessage("端口"),
         "preview": MessageLookupByLibrary.simpleMessage("预览"),
         "profile": MessageLookupByLibrary.simpleMessage("配置"),
@@ -125,10 +179,21 @@ class MessageLookup extends MessageLookupByLibrary {
         "project": MessageLookupByLibrary.simpleMessage("项目"),
         "proxies": MessageLookupByLibrary.simpleMessage("代理"),
         "proxyPort": MessageLookupByLibrary.simpleMessage("代理端口"),
+        "proxyPortDesc": MessageLookupByLibrary.simpleMessage("设置clash监听端口"),
         "qrcode": MessageLookupByLibrary.simpleMessage("二维码"),
         "qrcodeDesc": MessageLookupByLibrary.simpleMessage("扫描二维码获取配置文件"),
+        "recovery": MessageLookupByLibrary.simpleMessage("恢复"),
+        "recoveryAll": MessageLookupByLibrary.simpleMessage("恢复所有数据"),
+        "recoveryDesc": MessageLookupByLibrary.simpleMessage("从WebDAV恢复数据"),
+        "recoveryProfiles": MessageLookupByLibrary.simpleMessage("仅恢复配置文件"),
+        "recoverySuccess": MessageLookupByLibrary.simpleMessage("恢复成功"),
+        "requests": MessageLookupByLibrary.simpleMessage("请求"),
+        "requestsDesc": 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("设置"),
@@ -139,23 +204,32 @@ class MessageLookup extends MessageLookupByLibrary {
         "stopVpn": MessageLookupByLibrary.simpleMessage("正在停止VPN..."),
         "submit": MessageLookupByLibrary.simpleMessage("提交"),
         "systemProxy": MessageLookupByLibrary.simpleMessage("系统代理"),
+        "systemProxyDesc":
+            MessageLookupByLibrary.simpleMessage("为VpnService附加HTTP代理"),
         "tabAnimation": MessageLookupByLibrary.simpleMessage("选项卡动画"),
         "tabAnimationDesc":
             MessageLookupByLibrary.simpleMessage("开启后，主页选项卡将添加切换动画"),
+        "tcpConcurrent": MessageLookupByLibrary.simpleMessage("TCP并发"),
+        "tcpConcurrentDesc": MessageLookupByLibrary.simpleMessage("开启后允许tcp并发"),
         "theme": MessageLookupByLibrary.simpleMessage("主题"),
         "themeColor": MessageLookupByLibrary.simpleMessage("主题色彩"),
         "themeDesc": MessageLookupByLibrary.simpleMessage("设置深色模式，调整色彩"),
         "themeMode": MessageLookupByLibrary.simpleMessage("主题模式"),
+        "tip": MessageLookupByLibrary.simpleMessage("提示"),
         "tools": MessageLookupByLibrary.simpleMessage("工具"),
         "trafficUsage": MessageLookupByLibrary.simpleMessage("流量统计"),
-        "tun": MessageLookupByLibrary.simpleMessage("虚拟网络设备"),
+        "tun": MessageLookupByLibrary.simpleMessage("Tun模式"),
         "tunDesc": MessageLookupByLibrary.simpleMessage("仅在管理员模式生效"),
         "unableToUpdateCurrentProfileDesc":
             MessageLookupByLibrary.simpleMessage("无法更新当前配置文件"),
+        "unifiedDelay": MessageLookupByLibrary.simpleMessage("统一延迟"),
+        "unifiedDelayDesc": 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(
@@ -410,10 +430,10 @@ class AppLocalizations {
     );
   }
 
-  /// `Tun`
+  /// `Tun mode`
   String get tun {
     return Intl.message(
-      'Tun',
+      'Tun mode',
       name: 'tun',
       desc: '',
       args: [],
@@ -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(
@@ -980,6 +1020,16 @@ class AppLocalizations {
     );
   }
 
+  /// `Please upload a valid QR code`
+  String get pleaseUploadValidQrcode {
+    return Intl.message(
+      'Please upload a valid QR code',
+      name: 'pleaseUploadValidQrcode',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `Blacklist mode`
   String get blacklistMode {
     return Intl.message(
@@ -1120,6 +1170,16 @@ class AppLocalizations {
     );
   }
 
+  /// `Set the clash listening port`
+  String get proxyPortDesc {
+    return Intl.message(
+      'Set the clash listening port',
+      name: 'proxyPortDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `Port`
   String get port {
     return Intl.message(
@@ -1190,16 +1250,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(
@@ -1259,6 +1309,606 @@ class AppLocalizations {
       args: [],
     );
   }
+
+  /// `Compatibility mode`
+  String get compatible {
+    return Intl.message(
+      'Compatibility mode',
+      name: 'compatible',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Opening it will lose part of its application ability and gain the support of full amount of Clash.`
+  String get compatibleDesc {
+    return Intl.message(
+      'Opening it will lose part of its application ability and gain the support of full amount of Clash.',
+      name: 'compatibleDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `The current proxy group cannot be selected.`
+  String get notSelectedTip {
+    return Intl.message(
+      'The current proxy group cannot be selected.',
+      name: 'notSelectedTip',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `tip`
+  String get tip {
+    return Intl.message(
+      'tip',
+      name: 'tip',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Backup and Recovery`
+  String get backupAndRecovery {
+    return Intl.message(
+      'Backup and Recovery',
+      name: 'backupAndRecovery',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Sync data by WebDAV`
+  String get backupAndRecoveryDesc {
+    return Intl.message(
+      'Sync data by WebDAV',
+      name: 'backupAndRecoveryDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Account`
+  String get account {
+    return Intl.message(
+      'Account',
+      name: 'account',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Backup`
+  String get backup {
+    return Intl.message(
+      'Backup',
+      name: 'backup',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Backup local data to WebDAV`
+  String get backupDesc {
+    return Intl.message(
+      'Backup local data to WebDAV',
+      name: 'backupDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Recovery`
+  String get recovery {
+    return Intl.message(
+      'Recovery',
+      name: 'recovery',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Recovery data from WebDAV`
+  String get recoveryDesc {
+    return Intl.message(
+      'Recovery data from WebDAV',
+      name: 'recoveryDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Only recovery profiles`
+  String get recoveryProfiles {
+    return Intl.message(
+      'Only recovery profiles',
+      name: 'recoveryProfiles',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Recovery all data`
+  String get recoveryAll {
+    return Intl.message(
+      'Recovery all data',
+      name: 'recoveryAll',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Recovery success`
+  String get recoverySuccess {
+    return Intl.message(
+      'Recovery success',
+      name: 'recoverySuccess',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Backup success`
+  String get backupSuccess {
+    return Intl.message(
+      'Backup success',
+      name: 'backupSuccess',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `No info`
+  String get noInfo {
+    return Intl.message(
+      'No info',
+      name: 'noInfo',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Please bind WebDAV`
+  String get pleaseBindWebDAV {
+    return Intl.message(
+      'Please bind WebDAV',
+      name: 'pleaseBindWebDAV',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Bind`
+  String get bind {
+    return Intl.message(
+      'Bind',
+      name: 'bind',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Connectivity：`
+  String get connectivity {
+    return Intl.message(
+      'Connectivity：',
+      name: 'connectivity',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `WebDAV configuration`
+  String get webDAVConfiguration {
+    return Intl.message(
+      'WebDAV configuration',
+      name: 'webDAVConfiguration',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Address`
+  String get address {
+    return Intl.message(
+      'Address',
+      name: 'address',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `WebDAV server address`
+  String get addressHelp {
+    return Intl.message(
+      'WebDAV server address',
+      name: 'addressHelp',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Please enter a valid WebDAV address`
+  String get addressTip {
+    return Intl.message(
+      'Please enter a valid WebDAV address',
+      name: 'addressTip',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Password`
+  String get password {
+    return Intl.message(
+      'Password',
+      name: 'password',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Password cannot be empty`
+  String get passwordTip {
+    return Intl.message(
+      'Password cannot be empty',
+      name: 'passwordTip',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Account cannot be empty`
+  String get accountTip {
+    return Intl.message(
+      'Account cannot be empty',
+      name: 'accountTip',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Check for updates`
+  String get checkUpdate {
+    return Intl.message(
+      'Check for updates',
+      name: 'checkUpdate',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Discover the new version`
+  String get discoverNewVersion {
+    return Intl.message(
+      'Discover the new version',
+      name: 'discoverNewVersion',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `The current application is already the latest version`
+  String get checkUpdateError {
+    return Intl.message(
+      'The current application is already the latest version',
+      name: 'checkUpdateError',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Go to download`
+  String get goDownload {
+    return Intl.message(
+      'Go to download',
+      name: 'goDownload',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `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: [],
+    );
+  }
+
+  /// `Allow applications to bypass VPN`
+  String get allowBypass {
+    return Intl.message(
+      'Allow applications to bypass VPN',
+      name: 'allowBypass',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Some apps can bypass VPN when turned on`
+  String get allowBypassDesc {
+    return Intl.message(
+      'Some apps can bypass VPN when turned on',
+      name: 'allowBypassDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `ExternalController`
+  String get externalController {
+    return Intl.message(
+      'ExternalController',
+      name: 'externalController',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Once enabled, the clash kernel can be controlled on port 9090`
+  String get externalControllerDesc {
+    return Intl.message(
+      'Once enabled, the clash kernel can be controlled on port 9090',
+      name: 'externalControllerDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `When turned on it will be able to receive ipv6 traffic`
+  String get ipv6Desc {
+    return Intl.message(
+      'When turned on it will be able to receive ipv6 traffic',
+      name: 'ipv6Desc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `App`
+  String get app {
+    return Intl.message(
+      'App',
+      name: 'app',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `General`
+  String get general {
+    return Intl.message(
+      'General',
+      name: 'general',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Attach HTTP proxy to VpnService`
+  String get systemProxyDesc {
+    return Intl.message(
+      'Attach HTTP proxy to VpnService',
+      name: 'systemProxyDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Unified delay`
+  String get unifiedDelay {
+    return Intl.message(
+      'Unified delay',
+      name: 'unifiedDelay',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Remove extra delays such as handshaking`
+  String get unifiedDelayDesc {
+    return Intl.message(
+      'Remove extra delays such as handshaking',
+      name: 'unifiedDelayDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Tcp concurrent`
+  String get tcpConcurrent {
+    return Intl.message(
+      'Tcp concurrent',
+      name: 'tcpConcurrent',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Enabling it will allow tcp concurrency`
+  String get tcpConcurrentDesc {
+    return Intl.message(
+      'Enabling it will allow tcp concurrency',
+      name: 'tcpConcurrentDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Geo Low Memory Mode`
+  String get geodataLoader {
+    return Intl.message(
+      'Geo Low Memory Mode',
+      name: 'geodataLoader',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Enabling will use the Geo low memory loader`
+  String get geodataLoaderDesc {
+    return Intl.message(
+      'Enabling will use the Geo low memory loader',
+      name: 'geodataLoaderDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Requests`
+  String get requests {
+    return Intl.message(
+      'Requests',
+      name: 'requests',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `View recently requested data`
+  String get requestsDesc {
+    return Intl.message(
+      'View recently requested data',
+      name: 'requestsDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `No proxy or no request`
+  String get nullRequestsDesc {
+    return Intl.message(
+      'No proxy or no request',
+      name: 'nullRequestsDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Find process`
+  String get findProcessMode {
+    return Intl.message(
+      'Find process',
+      name: 'findProcessMode',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `There is a risk of flashback after opening`
+  String get findProcessModeDesc {
+    return Intl.message(
+      'There is a risk of flashback after opening',
+      name: 'findProcessModeDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Init`
+  String get init {
+    return Intl.message(
+      'Init',
+      name: 'init',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Long term effective`
+  String get infiniteTime {
+    return Intl.message(
+      'Long term effective',
+      name: 'infiniteTime',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Expiration time`
+  String get expirationTime {
+    return Intl.message(
+      'Expiration time',
+      name: 'expirationTime',
+      desc: '',
+      args: [],
+    );
+  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {

lib/main.dart

@@ -17,13 +17,16 @@ Future<void> main() async {
   await window?.init();
   final config = await preferences.getConfig() ?? Config();
   final clashConfig = await preferences.getClashConfig() ?? ClashConfig();
-  final appState = AppState();
+  final appState = AppState(
-  await globalState.init(
+    mode: clashConfig.mode,
-    appState: appState,
+    isCompatible: config.isCompatible,
-    config: config,
+    selectedMap: config.currentSelectedMap,
-    clashConfig: clashConfig,
   );
-  globalState.updateNavigationItems(
+  appState.navigationItems = navigation.getItems(
+    openLogs: config.openLogs,
+    hasProxies: false,
+  );
+  await globalState.init(
     appState: appState,
     config: config,
     clashConfig: clashConfig,
@@ -41,26 +44,38 @@ Future<void> vpnService() async {
   WidgetsFlutterBinding.ensureInitialized();
   final config = await preferences.getConfig() ?? Config();
   final clashConfig = await preferences.getClashConfig() ?? ClashConfig();
-  final appState = AppState();
+  final appState = AppState(
+    mode: clashConfig.mode,
+    isCompatible: config.isCompatible,
+    selectedMap: config.currentSelectedMap,
+  );
   clashMessage.addListener(ClashMessageListenerWithVpn(onTun: (String fd) {
     proxyManager.setProtect(
       int.parse(fd),
     );
   }));
+
   await globalState.init(
     appState: appState,
     config: config,
     clashConfig: clashConfig,
   );
 
+  await globalState.applyProfile(
+    appState: appState,
+    config: config,
+    clashConfig: clashConfig,
+  );
+
   final appLocalizations = await AppLocalizations.load(
-    Other.getLocaleForString(config.locale) ??
+    other.getLocaleForString(config.locale) ??
         WidgetsBinding.instance.platformDispatcher.locale,
   );
 
   handleStart() async {
     await app?.tip(appLocalizations.startVpn);
     await globalState.startSystemProxy(
+      appState: appState,
       config: config,
       clashConfig: clashConfig,
     );
@@ -72,19 +87,18 @@ Future<void> vpnService() async {
     ];
   }
 
-  if (appState.isInit) {
+  handleStart();
-    handleStart();
+
-    tile?.addListener(
+  tile?.addListener(
-      TileListenerWithVpn(
+    TileListenerWithVpn(
-        onStop: () async {
+      onStop: () async {
-          await app?.tip(appLocalizations.stopVpn);
+        await app?.tip(appLocalizations.stopVpn);
-          await globalState.stopSystemProxy();
+        await globalState.stopSystemProxy();
-          clashCore.shutdown();
+        clashCore.shutdown();
-          exit(0);
+        exit(0);
-        },
+      },
-      ),
+    ),
-    );
+  );
-  }
 }
 
 class ClashMessageListenerWithVpn with ClashMessageListener {

lib/models/app.dart

@@ -1,37 +1,58 @@
+import 'dart:io';
+
 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 'connection.dart';
 import 'ffi.dart';
 import 'log.dart';
 import 'navigation.dart';
-import 'package.dart';
+import 'profile.dart';
 import 'proxy.dart';
 import 'system_color_scheme.dart';
 import 'traffic.dart';
 import 'version.dart';
 
+typedef DelayMap = Map<String, int?>;
+
 class AppState with ChangeNotifier {
   List<NavigationItem> _navigationItems;
   int? _runTime;
   bool _isInit;
-  DelayMap _delayMap;
   VersionInfo? _versionInfo;
   List<Traffic> _traffics;
+  Traffic _totalTraffic;
   List<Log> _logs;
-  List<Package> _packages;
   String _currentLabel;
   SystemColorSchemes _systemColorSchemes;
+  num _sortNum;
+  Mode _mode;
+  DelayMap _delayMap;
+  SelectedMap _selectedMap;
+  bool _isCompatible;
   List<Group> _groups;
+  double _viewWidth;
+  List<Connection> _requests;
 
-  AppState()
+  AppState({
-      : _navigationItems = [],
+    required Mode mode,
-        _delayMap = {},
+    required bool isCompatible,
+    required SelectedMap selectedMap,
+  })  : _navigationItems = [],
         _isInit = false,
         _currentLabel = "dashboard",
         _traffics = [],
         _logs = [],
+        _viewWidth = 0,
+        _selectedMap = selectedMap,
+        _sortNum = 0,
+        _requests = [],
+        _mode = mode,
+        _totalTraffic = Traffic(),
+        _delayMap = {},
         _groups = [],
-        _packages = [],
+        _isCompatible = isCompatible,
         _systemColorSchemes = SystemColorSchemes();
 
   String get currentLabel => _currentLabel;
@@ -52,6 +73,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) {
@@ -61,6 +96,8 @@ class AppState with ChangeNotifier {
     }
   }
 
+  bool get isStart => _runTime != null;
+
   int? get runTime => _runTime;
 
   set runTime(int? value) {
@@ -70,20 +107,38 @@ class AppState with ChangeNotifier {
     }
   }
 
-  DelayMap get delayMap => _delayMap;
+  String getDesc(String type, String? proxyName) {
-
+    final groupTypeNamesList = GroupType.values.map((e) => e.name).toList();
-  set delayMap(DelayMap value) {
+    if (!groupTypeNamesList.contains(type)) {
-    if (_delayMap != value) {
+      return type;
-      _delayMap = value;
+    } else {
-      notifyListeners();
+      final index = groups.indexWhere((element) => element.name == proxyName);
+      if (index == -1) return type;
+      return "$type(${groups[index].now ?? '*'})";
     }
   }
 
-  setDelay(Delay delay) {
+  String? getRealProxyName(String? proxyName) {
-    if (_delayMap[delay.name] != delay.value) {
+    if (proxyName == null) return null;
-      _delayMap = Map.from(_delayMap)..[delay.name] = delay.value;
+    final index = groups.indexWhere((element) => element.name == proxyName);
-      notifyListeners();
+    if (index == -1) return proxyName;
+    final group = groups[index];
+    return getRealProxyName(selectedMap.containsKey(proxyName)
+        ? selectedMap[proxyName]
+        : group.now);
+  }
+
+  String? get showProxyName {
+    if (currentGroups.isEmpty) {
+      return UsedProxy.DIRECT.name;
     }
+    final firstGroup = currentGroups.first;
+    final firstGroupName = firstGroup.name;
+    return selectedMap[firstGroupName] ?? firstGroup.now;
+  }
+
+  int? getDelay(String? proxyName) {
+    return _delayMap[getRealProxyName(proxyName)];
   }
 
   VersionInfo? get versionInfo => _versionInfo;
@@ -104,8 +159,39 @@ class AppState with ChangeNotifier {
     }
   }
 
-  addTraffic(Traffic value) {
+  addTraffic(Traffic traffic) {
-    _traffics = List.from(_traffics)..add(value);
+    _traffics = List.from(_traffics)..add(traffic);
+    const maxLength = 60;
+    if (_traffics.length > maxLength) {
+      _traffics = _traffics.sublist(_traffics.length - maxLength);
+    }
+    notifyListeners();
+  }
+
+  Traffic get totalTraffic => _totalTraffic;
+
+  set totalTraffic(Traffic value) {
+    if (_totalTraffic != value) {
+      _totalTraffic = value;
+      notifyListeners();
+    }
+  }
+
+  List<Connection> get requests => _requests;
+
+  set requests(List<Connection> value) {
+    if (_requests != value) {
+      _requests = value;
+      notifyListeners();
+    }
+  }
+
+  addRequest(Connection value) {
+    _requests.add(value);
+    final maxLength = Platform.isAndroid ? 1000 : 60;
+    if (_requests.length > maxLength) {
+      _requests = _requests.sublist(_requests.length - maxLength);
+    }
     notifyListeners();
   }
 
@@ -120,6 +206,10 @@ class AppState with ChangeNotifier {
 
   addLog(Log log) {
     _logs.add(log);
+    final maxLength = Platform.isAndroid ? 1000 : 60;
+    if (_logs.length > maxLength) {
+      _logs = _logs.sublist(_logs.length - maxLength);
+    }
     notifyListeners();
   }
 
@@ -132,67 +222,102 @@ 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) {
-    if (_groups != value) {
+    if (!const ListEquality<Group>().equals(_groups, value)) {
       _groups = value;
       notifyListeners();
     }
   }
 
-  List<Group> getCurrentGroups(Mode mode) {
+  num get sortNum => _sortNum;
+
+  set sortNum(num value) {
+    if (_sortNum != value) {
+      _sortNum = value;
+      notifyListeners();
+    }
+  }
+
+  Mode get mode => _mode;
+
+  set mode(Mode value) {
+    if (_mode != value) {
+      _mode = value;
+      notifyListeners();
+    }
+  }
+
+  bool get isCompatible {
+    return _isCompatible;
+  }
+
+  set isCompatible(bool value) {
+    if (_isCompatible != value) {
+      _isCompatible = value;
+      notifyListeners();
+    }
+  }
+
+  SelectedMap get selectedMap {
+    return _selectedMap;
+  }
+
+  set selectedMap(SelectedMap value) {
+    if (!const MapEquality<String, String>().equals(_selectedMap, value)) {
+      _selectedMap = value;
+      notifyListeners();
+    }
+  }
+
+  List<Group> get currentGroups {
     switch (mode) {
       case Mode.direct:
         return [];
       case Mode.global:
         return groups
-            .where((element) => element.name == UsedProxy.GLOBAL.name)
+            .where((element) => element.name == GroupName.GLOBAL.name)
             .toList();
       case Mode.rule:
         return groups
-            .where((element) => element.name != UsedProxy.GLOBAL.name)
+            .where((element) => element.name != GroupName.GLOBAL.name)
             .toList();
     }
   }
 
-  String? getCurrentGroupNameWithGroups(
+  double get viewWidth => _viewWidth;
-    List<Group> groups,
+
-    String? groupName,
+  set viewWidth(double value) {
-    Mode mode,
+    if (_viewWidth != value) {
-  ) {
+      _viewWidth = value;
-    switch (mode) {
+      notifyListeners();
-      case Mode.direct:
-        return null;
-      case Mode.global:
-        return UsedProxy.GLOBAL.name;
-      case Mode.rule:
-        return groupName ?? (groups.isNotEmpty ? groups.first.name : null);
     }
   }
 
-  String? getCurrentGroupName(String? groupName, Mode mode) {
+  ViewMode get viewMode => other.getViewMode(_viewWidth);
-    final currentGroups = getCurrentGroups(mode);
+
-    return getCurrentGroupNameWithGroups(currentGroups, groupName, mode);
+  DelayMap get delayMap {
+    return _delayMap;
   }
 
-  String? getCurrentProxyName(String? proxyName, Mode mode) {
+  set delayMap(DelayMap value) {
-    final currentGroups = getCurrentGroups(mode);
+    if (!const MapEquality<String, int?>().equals(_delayMap, value)) {
-    switch (mode) {
+      _delayMap = value;
-      case Mode.direct:
+      notifyListeners();
-        return UsedProxy.DIRECT.name;
-      case Mode.global || Mode.rule:
-        return proxyName ??
-            (currentGroups.isNotEmpty ? currentGroups.first.now : null);
     }
   }
+
+  setDelay(Delay delay) {
+    if (_delayMap[delay.name] != delay.value) {
+      _delayMap = Map.from(_delayMap)..[delay.name] = delay.value;
+      notifyListeners();
+    }
+  }
+
+  Group? getGroupWithName(String groupName) {
+    final index =
+        currentGroups.indexWhere((element) => element.name == groupName);
+    return index != -1 ? currentGroups[index] : null;
+  }
 }

lib/models/clash_config.dart

@@ -1,37 +1,26 @@
+// ignore_for_file: invalid_annotation_target
+
+import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/common/constant.dart';
 import 'package:flutter/material.dart';
-import 'package:json_annotation/json_annotation.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 
 import '../enum/enum.dart';
 
 part 'generated/clash_config.g.dart';
 
-@JsonSerializable()
+part 'generated/clash_config.freezed.dart';
-class Tun {
-  bool enable;
-  String device;
-  TunStack stack;
-  @JsonKey(name: "dns-hijack")
-  List<String> dnsHijack;
 
-  Tun()  : enable = false,
+@freezed
-        stack = TunStack.gvisor,
+class Tun with _$Tun {
-        dnsHijack = ["any:53"],
+  const factory Tun({
-        device = appConstant.name;
+    @Default(false) bool enable,
+    @Default(appName) String device,
+    @Default(TunStack.gvisor) TunStack stack,
+    @JsonKey(name: "dns-hijack") @Default(["any:53"]) List<String> dnsHijack,
+  }) = _Tun;
 
-  factory Tun.fromJson(Map<String, dynamic> json) {
+  factory Tun.fromJson(Map<String, Object?> json) => _$TunFromJson(json);
-    return _$TunFromJson(json);
-  }
-
-  Map<String, dynamic> toJson() {
-    return _$TunToJson(this);
-  }
-
-  // Tun copyWith({bool? enable, int? fileDescriptor}) {
-  //   return Tun(
-  //     enable: enable ?? this.enable,
-  //   );
-  // }
 }
 
 @JsonSerializable()
@@ -119,29 +108,34 @@ class Dns {
 class ClashConfig extends ChangeNotifier {
   int _mixedPort;
   bool _allowLan;
-  Mode _mode;
+  bool _ipv6;
+  String _geodataLoader;
   LogLevel _logLevel;
+  String _externalController;
+  Mode _mode;
+  FindProcessMode _findProcessMode;
+  bool _unifiedDelay;
+  bool _tcpConcurrent;
   Tun _tun;
   Dns _dns;
   List<String> _rules;
 
-  ClashConfig({
+  ClashConfig()
-    int? mixedPort,
+      : _mixedPort = 7890,
-    Mode? mode,
+        _mode = Mode.rule,
-    bool? allowLan,
+        _ipv6 = false,
-    LogLevel? logLevel,
+        _findProcessMode = FindProcessMode.off,
-    Tun? tun,
+        _allowLan = false,
-    Dns? dns,
+        _tcpConcurrent = false,
-    List<String>? rules,
+        _logLevel = LogLevel.info,
-  })  : _mixedPort = mixedPort ?? 7890,
+        _tun = const Tun(),
-        _mode = mode ?? Mode.rule,
+        _unifiedDelay = false,
-        _allowLan = allowLan ?? false,
+        _geodataLoader = geodataLoaderMemconservative,
-        _logLevel = logLevel ?? LogLevel.info,
+        _externalController = '',
-        _tun = tun ?? Tun(),
+        _dns = Dns(),
-        _dns = dns ?? Dns(),
+        _rules = [];
-        _rules = rules ?? [];
 
-  @JsonKey(name: "mixed-port")
+  @JsonKey(name: "mixed-port", defaultValue: 7890)
   int get mixedPort => _mixedPort;
 
   set mixedPort(int value) {
@@ -151,6 +145,7 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
+  @JsonKey(defaultValue: Mode.rule)
   Mode get mode => _mode;
 
   set mode(Mode value) {
@@ -160,6 +155,16 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
+  @JsonKey(name: "find-process-mode", defaultValue: FindProcessMode.off)
+  FindProcessMode get findProcessMode => _findProcessMode;
+
+  set findProcessMode(FindProcessMode value) {
+    if (_findProcessMode != value) {
+      _findProcessMode = value;
+      notifyListeners();
+    }
+  }
+
   @JsonKey(name: "allow-lan")
   bool get allowLan => _allowLan;
 
@@ -170,7 +175,7 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
-  @JsonKey(name: "log-level")
+  @JsonKey(name: "log-level", defaultValue: LogLevel.info)
   LogLevel get logLevel => _logLevel;
 
   set logLevel(LogLevel value) {
@@ -180,6 +185,56 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
+  @JsonKey(name: "external-controller", defaultValue: '')
+  String get externalController => _externalController;
+
+  set externalController(String value) {
+    if (_externalController != value) {
+      _externalController = value;
+      notifyListeners();
+    }
+  }
+
+  @JsonKey(defaultValue: false)
+  bool get ipv6 => _ipv6;
+
+  set ipv6(bool value) {
+    if (_ipv6 != value) {
+      _ipv6 = value;
+      notifyListeners();
+    }
+  }
+
+  @JsonKey(name: "geodata-loader", defaultValue: geodataLoaderMemconservative)
+  String get geodataLoader => _geodataLoader;
+
+  set geodataLoader(String value) {
+    if (_geodataLoader != value) {
+      _geodataLoader = value;
+      notifyListeners();
+    }
+  }
+
+  @JsonKey(name: "unified-delay", defaultValue: false)
+  bool get unifiedDelay => _unifiedDelay;
+
+  set unifiedDelay(bool value) {
+    if (_unifiedDelay != value) {
+      _unifiedDelay = value;
+      notifyListeners();
+    }
+  }
+
+  @JsonKey(name: "tcp-concurrent", defaultValue: false)
+  bool get tcpConcurrent => _tcpConcurrent;
+
+  set tcpConcurrent(bool value) {
+    if (_tcpConcurrent != value) {
+      _tcpConcurrent = value;
+      notifyListeners();
+    }
+  }
+
   Tun get tun => _tun;
 
   set tun(Tun value) {
@@ -207,6 +262,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);
   }
@@ -215,14 +283,8 @@ class ClashConfig extends ChangeNotifier {
     return _$ClashConfigFromJson(json);
   }
 
-  ClashConfig copyWith({Tun? tun}) {
+  @override
-    return ClashConfig(
+  String toString() {
-      mixedPort: mixedPort,
+    return 'ClashConfig{_mixedPort: $_mixedPort, _allowLan: $_allowLan, _mode: $_mode, _logLevel: $_logLevel, _tun: $_tun, _dns: $_dns, _rules: $_rules}';
-      mode: mode,
-      logLevel: logLevel,
-      tun: tun ?? this.tun,
-      dns: dns,
-      allowLan: allowLan,
-    );
   }
 }

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,58 +9,36 @@ import 'models.dart';
 
 part 'generated/config.g.dart';
 
-@JsonSerializable()
+part 'generated/config.freezed.dart';
-class AccessControl {
-  AccessControlMode mode;
-  List<String> acceptList;
-  List<String> rejectList;
-  bool isFilterSystemApp;
 
-  AccessControl({
+@freezed
-    this.isFilterSystemApp = true,
+class AccessControl with _$AccessControl {
-    this.mode = AccessControlMode.rejectSelected,
+  const factory AccessControl({
-    this.acceptList = const [],
+    @Default(AccessControlMode.rejectSelected) AccessControlMode mode,
-    this.rejectList = const [],
+    @Default([]) List<String> acceptList,
-  });
+    @Default([]) List<String> rejectList,
+    @Default(true) bool isFilterSystemApp,
+  }) = _AccessControl;
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  factory AccessControl.fromJson(Map<String, Object?> json) =>
-  List<String> get currentList =>
+      _$AccessControlFromJson(json);
-      mode == AccessControlMode.acceptSelected ? acceptList : rejectList;
+}
 
-  set currentList(List<String> currentList) {
+@freezed
-    if (mode == AccessControlMode.acceptSelected) {
+class Props with _$Props {
-      acceptList = currentList;
+  const factory Props({
-    } else {
+    AccessControl? accessControl,
-      rejectList = currentList;
+    bool? allowBypass,
-    }
+    bool? systemProxy,
-  }
+  }) = _Props;
 
-  AccessControl copyWith({
+  factory Props.fromJson(Map<String, Object?> json) => _$PropsFromJson(json);
-    AccessControlMode? mode,
-    List<String>? acceptList,
-    List<String>? rejectList,
-    bool? isFilterSystemApp,
-  }) {
-    return AccessControl(
-      mode: mode ?? this.mode,
-      acceptList: acceptList ?? this.acceptList,
-      rejectList: rejectList ?? this.rejectList,
-      isFilterSystemApp: isFilterSystemApp ?? this.isFilterSystemApp,
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return _$AccessControlToJson(this);
-  }
-
-  factory AccessControl.fromJson(Map<String, dynamic> json) {
-    return _$AccessControlFromJson(json);
-  }
 }
 
 @JsonSerializable()
 class Config extends ChangeNotifier {
   List<Profile> _profiles;
+  bool _isCompatible;
   String? _currentProfileId;
   bool _autoLaunch;
   bool _silentLaunch;
@@ -74,6 +52,10 @@ class Config extends ChangeNotifier {
   bool _isAccessControl;
   AccessControl _accessControl;
   bool _isAnimateToPage;
+  bool _autoCheckUpdate;
+  bool _allowBypass;
+  bool _systemProxy;
+  DAV? _dav;
 
   Config()
       : _profiles = [],
@@ -82,12 +64,16 @@ class Config extends ChangeNotifier {
         _autoRun = false,
         _themeMode = ThemeMode.system,
         _openLog = false,
-        _primaryColor = appConstant.defaultPrimaryColor.value,
+        _isCompatible = true,
+        _primaryColor = defaultPrimaryColor.value,
         _proxiesSortType = ProxiesSortType.none,
         _isMinimizeOnExit = true,
         _isAccessControl = false,
-        _accessControl = AccessControl(),
+        _autoCheckUpdate = true,
-        _isAnimateToPage = true;
+        _systemProxy = true,
+        _accessControl = const AccessControl(),
+        _isAnimateToPage = true,
+        _allowBypass = true;
 
   deleteProfileById(String id) {
     _profiles = profiles.where((element) => element.id != id).toList();
@@ -106,17 +92,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);
@@ -129,6 +116,10 @@ class Config extends ChangeNotifier {
       profilesTemp[index] = updateProfile;
     }
     _profiles = profilesTemp;
+  }
+
+  setProfile(Profile profile) {
+    _setProfile(profile);
     notifyListeners();
   }
 
@@ -159,9 +150,26 @@ class Config extends ChangeNotifier {
     }
   }
 
-  String? get currentProxyName => currentProfile?.proxyName;
+  String? get currentGroupName => currentProfile?.currentGroupName;
 
-  String? get currentGroupName => currentProfile?.groupName;
+  updateCurrentGroupName(String groupName) {
+    if (currentProfile?.currentGroupName != groupName) {
+      currentProfile?.currentGroupName = groupName;
+      notifyListeners();
+    }
+  }
+
+  SelectedMap get currentSelectedMap {
+    return currentProfile?.selectedMap ?? {};
+  }
+
+  updateCurrentSelectedMap(String groupName, String proxyName) {
+    if (currentProfile?.selectedMap[groupName] != proxyName) {
+      currentProfile?.selectedMap = Map.from(currentProfile?.selectedMap ?? {})
+        ..[groupName] = proxyName;
+      notifyListeners();
+    }
+  }
 
   @JsonKey(defaultValue: false)
   bool get autoLaunch {
@@ -269,9 +277,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();
     }
   }
@@ -289,7 +306,86 @@ class Config extends ChangeNotifier {
     }
   }
 
-  update() {
+  @JsonKey(defaultValue: true)
+  bool get isCompatible {
+    return _isCompatible;
+  }
+
+  set isCompatible(bool value) {
+    if (_isCompatible != value) {
+      _isCompatible = value;
+      notifyListeners();
+    }
+  }
+
+  @JsonKey(defaultValue: true)
+  bool get autoCheckUpdate {
+    return _autoCheckUpdate;
+  }
+
+  set autoCheckUpdate(bool value) {
+    if (_autoCheckUpdate != value) {
+      _autoCheckUpdate = value;
+      notifyListeners();
+    }
+  }
+
+  @JsonKey(defaultValue: true)
+  bool get allowBypass {
+    return _allowBypass;
+  }
+
+  set allowBypass(bool value) {
+    if (_allowBypass != value) {
+      _allowBypass = value;
+      notifyListeners();
+    }
+  }
+
+  @JsonKey(defaultValue: true)
+  bool get systemProxy {
+    return _systemProxy;
+  }
+
+  set systemProxy(bool value) {
+    if (_systemProxy != value) {
+      _systemProxy = 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;
+      _allowBypass = config._allowBypass;
+      _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();
   }
 
@@ -300,4 +396,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/connection.dart

@@ -14,6 +14,7 @@ class Metadata with _$Metadata {
     required String destinationIP,
     required String destinationPort,
     required String host,
+    required String process,
     required String remoteDestination,
   }) = _Metadata;
 

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