Bump version

Report to @Mygod if you have any question. :)

.github/issue_template.md

@@ -0,0 +1,44 @@
+Please read FAQ in wiki then answer these questions before submitting your issue. Thanks!
+
+### Environment
+
+* Android version: *e.g. "7.0.0_r14", more detailed description is preferred*
+* Device: *e.g. Google Pixel XL*
+* Shadowsocks version: *version code "v3.0.0" or commit ID "a073f85"*
+* Last version that did not exhibit the issue (if applicable):
+
+### Configuration
+
+_Put an `x` inside the [ ] that applies._
+
+* [ ] IPv4 server address
+* [ ] IPv6 server address
+* [ ] Client IPv4 availability
+* [ ] Client IPv6 availability
+* Local port: 1080
+* Encrypt method:
+* [ ] One-time authentication
+* Route
+  * [ ] All
+  * [ ] Bypass LAN
+  * [ ] Bypass China
+  * [ ] Bypass LAN & China
+  * [ ] GFW List
+  * [ ] China List
+* [ ] IPv6 route
+* [ ] Per-App Proxy
+  * [ ] Bypass mode
+* [ ] UDP Forwarding
+* KCP Parameters: (leave blank if not enabled)
+* [ ] Auto Connect
+* [ ] TCP Fast Open
+* [ ] NAT mode
+
+### What did you do?
+
+
+### What did you expect to see?
+
+
+### What did you see instead?
+

.github/pull_request_template.md

@@ -0,0 +1,14 @@
+### Type of changes
+
+_Put an `x` inside the [ ] that applies._
+
+* [ ] Bugfix
+* [ ] New feature
+* [ ] Translation
+* [ ] General refinement
+* Other:
+
+### Details
+
+Please provide more details about changes if necessary.
+

.gitignore

@@ -15,6 +15,7 @@ gen_*
 *.o
 local.sbt
 .deps
+/proguard-sbt.txt
 
 #Intellij IDEA
 *.iml

.gitmodules

@@ -30,3 +30,6 @@
 [submodule "src/main/jni/mbedtls"]
 	path = src/main/jni/mbedtls
 	url = https://github.com/ARMmbed/mbedtls
+[submodule "src/main/jni/pcre"]
+	path = src/main/jni/pcre
+	url = https://android.googlesource.com/platform/external/pcre

.headache.cfg

@@ -0,0 +1,2 @@
+# Scala source
+".*\\.scala"    -> frame open:"/*" line:"*" close:"*/"

.travis.yml

@@ -27,7 +27,7 @@ cache:
 android:
     components:
         - tools
-        - build-tools-24.0.1
+        - build-tools-25.0.2
         - extra-android-m2repository
         - extra-google-m2repository
 

LICENSE

@@ -1,674 +1,17 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (C) 2016 by Max Lv <max.c.lv@gmail.com>
+Copyright (C) 2016 by Mygod Studio <contact-shadowsocks-android@mygod.be>
 
-                            Preamble
+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.
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+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.
 
-  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.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-  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 <http://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
-<http://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
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -14,7 +14,7 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.
 * SBT 0.13.0+
 * Go 1.4+
 * Android SDK
-  - Build Tools 24+ (as required by [`sbt-android`](https://github.com/scala-android/sbt-android))
+  - Build Tools 25+
   - Android Support Repository and Google Repository (see `build.sbt` for version)
 * Android NDK r12b+
 
@@ -24,7 +24,6 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.
 * Set environment variable `ANDROID_NDK_HOME` to `/path/to/android-ndk`
 * Set environment variable `GOROOT_BOOTSTRAP` to `/path/to/go`
 * Create your key following the instructions at https://developer.android.com/studio/publish/app-signing.html
-* Put your key in ~/.keystore
 * Create `local.properties` from `local.properties.example` with your own key information
 * Invoke the building like this
 
@@ -49,7 +48,7 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.
 ### LICENSE
 
 Copyright (C) 2016 by Max Lv <<max.c.lv@gmail.com>>  
-Copyright (C) 2016 by Mygod Studio <<mygodstudio@gmail.com>>
+Copyright (C) 2016 by Mygod Studio <<contact-shadowsocks-android@mygod.be>>
 
 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

build.sbt

@@ -1,63 +1,61 @@
-import android.Keys._
+scalaVersion := "2.11.8"
+dexMaxHeap := "4g"
 
-android.Plugin.androidBuild
-
-platformTarget in Android := "android-24"
+enablePlugins(AndroidApp)
+android.useSupportVectors
 
 name := "shadowsocks"
+version := "3.4.0"
+versionCode := Some(172)
 
-scalaVersion := "2.11.8"
+platformTarget := "android-25"
 
-compileOrder in Compile := CompileOrder.JavaThenScala
+compileOrder := CompileOrder.JavaThenScala
+javacOptions ++= "-source" :: "1.7" :: "-target" :: "1.7" :: Nil
+scalacOptions ++= "-target:jvm-1.7" :: "-Xexperimental" :: Nil
+ndkJavah := Seq()
+ndkBuild := Seq()
 
-javacOptions ++= Seq("-source", "1.7", "-target", "1.7")
+proguardVersion := "5.3.2"
+proguardCache := Seq()
+proguardOptions ++=
+  "-keep class com.github.shadowsocks.System { *; }" ::
+  "-dontwarn com.google.android.gms.internal.**" ::
+  "-dontwarn com.j256.ormlite.**" ::
+  "-dontwarn okio.**" ::
+  "-dontwarn org.xbill.**" ::
+  Nil
 
-scalacOptions ++= Seq("-target:jvm-1.7", "-Xexperimental")
-
-ndkJavah in Android := List()
-
-ndkBuild in Android := List()
-
-shrinkResources in Android := true
-
-typedResources in Android := false
-
-resConfigs in Android := Seq("ru", "zh", "zh-rCN")
-
-dexMaxHeap in Android := "4g"
+shrinkResources := true
+typedResources := false
+resConfigs := Seq("ja", "ru", "zh-rCN", "zh-rTW")
 
 resolvers += Resolver.jcenterRepo
-
-useSupportVectors
-
-libraryDependencies ++= Seq(
-  "com.android.support" % "design" % "24.2.0",
-  "com.android.support" % "gridlayout-v7" % "24.2.0",
-  "com.github.clans" % "fab" % "1.6.4",
-  "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01",
-  "com.github.kevinsawicki" % "http-request" % "6.0",
-  "com.google.android.gms" % "play-services-ads" % "9.4.0",
-  "com.google.android.gms" % "play-services-analytics" % "9.4.0",
-  "com.j256.ormlite" % "ormlite-android" % "5.0",
-  "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2",
-  "dnsjava" % "dnsjava" % "2.1.7",
-  "eu.chainfire" % "libsuperuser" % "1.0.0.201607041850",
-  "me.dm7.barcodescanner" % "zxing" % "1.9",
-  "net.glxn.qrgen" % "android" % "2.0"
-)
-
-proguardVersion in Android := "5.2.1"
-
-proguardCache in Android := Seq()
-
-proguardOptions in Android ++= Seq(
-  "-keep class com.github.shadowsocks.System { *; }",
-  "-dontwarn com.google.android.gms.internal.**",
-  "-dontwarn com.j256.ormlite.**",
-  "-dontwarn org.xbill.**")
+libraryDependencies ++=
+  "com.android.support" % "cardview-v7" % "25.1.0" ::
+  "com.android.support" % "design" % "25.1.0" ::
+  "com.android.support" % "gridlayout-v7" % "25.1.0" ::
+  "com.android.support" % "preference-v14" % "25.1.0" ::
+  "com.evernote" % "android-job" % "1.1.3" ::
+  "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01" ::
+  "com.google.android.gms" % "play-services-ads" % "10.0.1" ::
+  "com.google.android.gms" % "play-services-analytics" % "10.0.1" ::
+  "com.google.android.gms" % "play-services-gcm" % "10.0.1" ::
+  "com.j256.ormlite" % "ormlite-android" % "5.0" ::
+  "com.mikepenz" % "crossfader" % "1.5.0" ::
+  "com.mikepenz" % "fastadapter" % "2.1.5" ::
+  "com.mikepenz" % "iconics-core" % "2.8.2" ::
+  "com.mikepenz" % "materialdrawer" % "5.8.1" ::
+  "com.mikepenz" % "materialize" % "1.0.0" ::
+  "com.squareup.okhttp3" % "okhttp" % "3.5.0" ::
+  "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2" ::
+  "dnsjava" % "dnsjava" % "2.1.7" ::
+  "eu.chainfire" % "libsuperuser" % "1.0.0.201608240809" ::
+  "com.google.zxing" % "android-integration" % "3.2.1" ::
+  "net.glxn.qrgen" % "android" % "2.0" ::
+  Nil
 
 lazy val nativeBuild = TaskKey[Unit]("native-build", "Build native executables")
-
 nativeBuild := {
   val logger = streams.value.log
   Process("./build.sh") ! logger match {

kcptun/make.bash

@@ -51,7 +51,8 @@ export PATH=$GOROOT/bin:$PATH
 pushd kcptun/client
 
 echo "Get dependences for kcptun"
-go get -u github.com/madeye/kcp-go
+go get -u github.com/xtaci/kcp-go
+go get -u github.com/xtaci/smux
 go get
 
 echo "Cross compile kcptun for arm"

lint.xml

@@ -0,0 +1,3 @@
+<issue id="NewApi">
+  <ignore path="src/main/res/drawable"/>
+</issue>

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.13")
+addSbtPlugin("org.scala-android" % "sbt-android" % "1.7.2")
 
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")
 

src/main/AndroidManifest.xml

@@ -1,13 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
-          android:versionCode="147"
-          android:versionName="3.0.5">
+          xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.CAMERA" />
 
     <uses-feature android:name="android.hardware.touchscreen"
                   android:required="false"/>
@@ -20,13 +17,15 @@
 
     <uses-sdk
             android:minSdkVersion="19"
-            android:targetSdkVersion="24"/>
+            android:targetSdkVersion="25"/>
 
     <application
             android:allowBackup="true"
+            android:extractNativeLibs="false"
             android:name=".ShadowsocksApplication"
             android:hardwareAccelerated="true"
-            android:icon="@drawable/ic_launcher"
+            android:icon="@mipmap/ic_launcher"
+            android:roundIcon="@mipmap/ic_launcher"
             android:backupAgent=".ShadowsocksBackupAgent"
             android:label="@string/app_name"
             android:theme="@style/Theme.Material"
@@ -38,11 +37,7 @@
                    android:value="AEdPqrEAAAAI_zVxZthz2HDuz9toTvkYvL0L5GA-OjeUIfBeXg"/>
 
         <activity
-                android:name="com.google.android.gms.ads.AdActivity"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"/>
-
-        <activity
-                android:name=".Shadowsocks"
+                android:name=".MainActivity"
                 android:label="@string/app_name"
                 android:launchMode="singleTask">
             <intent-filter>
@@ -51,26 +46,7 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE" />
-            </intent-filter>
-        </activity>
-
-        <activity
-                android:name=".ShadowsocksRunnerActivity"
-                android:theme="@android:style/Theme.NoDisplay"
-                android:excludeFromRecents="true"
-                android:launchMode="singleTask">
-        </activity>
-
-        <activity
-                android:name=".ProfileManagerActivity"
-                android:label="@string/profiles"
-                android:parentActivityName=".Shadowsocks"
-                android:excludeFromRecents="true"
-                android:launchMode="singleTask">
-            <intent-filter>
-                <action android:name="com.github.shadowsocks.ProfileManagerActivity"/>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -83,36 +59,46 @@
                 <category android:name="android.intent.category.DEFAULT"/>
                 <data android:scheme="ss" />
             </intent-filter>
+            <meta-data android:name="android.app.shortcuts"
+                       android:resource="@xml/shortcuts"/>
         </activity>
 
         <activity
-                android:name=".ScannerActivity"
-                android:label="@string/add_profile_methods_scan_qr_code"
-                android:parentActivityName=".ProfileManagerActivity"
-                android:excludeFromRecents="true"/>
+                android:name=".ProfileConfigActivity"
+                android:excludeFromRecents="true"
+                android:label="@string/profile_config"
+                android:launchMode="singleTask"/>
+
+        <activity
+                android:name=".ShadowsocksRunnerActivity"
+                android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                android:excludeFromRecents="true"
+		        android:taskAffinity=""
+                android:launchMode="singleTask"/>
 
         <activity
                 android:name=".AppManager"
                 android:label="@string/proxied_apps"
-                android:parentActivityName=".Shadowsocks"
+                android:parentActivityName=".ProfileConfigActivity"
                 android:excludeFromRecents="true"
                 android:launchMode="singleTask"/>
 
         <activity android:name=".TaskerActivity"
-                  android:icon="@drawable/ic_launcher">
+                  android:icon="@mipmap/ic_launcher">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".ShadowsocksQuickSwitchActivity"
-                  android:launchMode="singleInstance"
-                  android:excludeFromRecents="true"
-                  android:taskAffinity=""
-                  android:theme="@style/Theme.Material.Dialog">
+        <activity
+                android:name=".QuickToggleShortcut"
+                android:label="@string/quick_toggle"
+                android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                android:excludeFromRecents="true"
+		android:taskAffinity=""
+                android:launchMode="singleTask">
             <intent-filter>
-                <action android:name="com.github.shadowsocks.QUICK_SWITCH" />
-                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="android.intent.action.CREATE_SHORTCUT" />
             </intent-filter>
         </activity>
 
@@ -158,6 +144,21 @@
                 <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING"/>
             </intent-filter>
         </receiver>
+
+        <!-- android-job components -->
+        <service android:name="com.evernote.android.job.v21.PlatformJobService"
+                 android:process=":bg"/>
+        <service android:name="com.evernote.android.job.v14.PlatformAlarmService"
+                 android:process=":bg"/>
+        <service android:name="com.evernote.android.job.gcm.PlatformGcmService"
+                 android:process=":bg"/>
+        <receiver android:name="com.evernote.android.job.v14.PlatformAlarmReceiver"
+                  android:process=":bg"/>
+        <receiver android:name="com.evernote.android.job.JobBootReceiver"
+                  android:process=":bg"/>
+
+        <!-- Strip useless components -->
+        <activity android:name="com.google.android.gms.ads.purchase.InAppPurchaseActivity" tools:node="remove"/>
     </application>
 
 </manifest>

src/main/aidl/com/github/shadowsocks/aidl/IShadowsocksService.aidl

@@ -4,8 +4,11 @@ import com.github.shadowsocks.aidl.IShadowsocksServiceCallback;
 
 interface IShadowsocksService {
   int getState();
+  String getProfileName();
 
   oneway void registerCallback(IShadowsocksServiceCallback cb);
+  oneway void startListeningForBandwidth(IShadowsocksServiceCallback cb);
+  oneway void stopListeningForBandwidth(IShadowsocksServiceCallback cb);
   oneway void unregisterCallback(IShadowsocksServiceCallback cb);
 
   oneway void use(in int profileId);

src/main/aidl/com/github/shadowsocks/aidl/IShadowsocksServiceCallback.aidl

@@ -1,6 +1,6 @@
 package com.github.shadowsocks.aidl;
 
 interface IShadowsocksServiceCallback {
-  oneway void stateChanged(int state, String msg);
+  oneway void stateChanged(int state, String profileName, String msg);
   oneway void trafficUpdated(long txRate, long rxRate, long txTotal, long rxTotal);
 }

src/main/assets/acl/bypass-lan.acl

@@ -0,0 +1,14 @@
+0.0.0.0/8
+10.0.0.0/8
+100.64.0.0/10
+127.0.0.0/8
+169.254.0.0/16
+172.16.0.0/12
+192.0.0.0/29
+192.0.2.0/24
+192.88.99.0/24
+192.168.0.0/16
+198.18.0.0/15
+198.51.100.0/24
+203.0.113.0/24
+224.0.0.0/3

src/main/assets/pages/about.html

@@ -275,7 +275,7 @@ img {
 <body>
 <p>A <a href="http://shadowsocks.org">Shadowsocks</a> client for Android, written in Scala.</p>
 <p>Copyright (C) 2016 by Max Lv <a href="&#x6d;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#x6d;&#97;x&#46;&#99;.&#108;&#118;&#x40;&#103;&#109;&#97;&#x69;&#108;&#46;&#x63;&#x6f;&#109;">&#x6d;&#97;&#x78;.&#x63;&#x2e;&#108;v&#64;&#x67;&#109;&#x61;&#x69;&#108;&#x2e;&#99;&#111;&#109;</a></p>
-<p>Copyright (C) 2016 by Mygod Studio <a href="mygodstudio@gmail.com">mygodstudio@gmail.com</a></p>
+<p>Copyright (C) 2016 by Mygod Studio <a href="contact-shadowsocks-android@mygod.be">contact-shadowsocks-android@mygod.be</a></p>
 <p>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

src/main/java/com/github/shadowsocks/DialogFragment.java

@@ -0,0 +1,15 @@
+package com.github.shadowsocks;
+
+import android.app.Activity;
+
+/**
+ * This helper class is used to solve Java-Scala interop problem. Use onAttach(Context) and remove this class
+ * when minSdkVersion >= 23.
+ *
+ * @author Mygod
+ */
+public class DialogFragment extends android.app.DialogFragment {
+    protected void superOnAttach(Activity activity) {
+        super.onAttach(activity);
+    }
+}

src/main/jni/Android.mk

@@ -371,7 +371,9 @@ PDNSD_SOURCES  := $(wildcard $(LOCAL_PATH)/pdnsd/src/*.c)
 LOCAL_MODULE    := pdnsd
 LOCAL_SRC_FILES := $(PDNSD_SOURCES:$(LOCAL_PATH)/%=%)
 LOCAL_CFLAGS    := -DANDROID -Wall -O2 -I$(LOCAL_PATH)/pdnsd \
-				   -I$(LOCAL_PATH)/include/pdnsd
+				   -I$(LOCAL_PATH)/include/pdnsd -I$(LOCAL_PATH)/libancillary
+LOCAL_STATIC_LIBRARIES := libancillary
+LOCAL_LDLIBS := -llog
 
 include $(BUILD_EXECUTABLE)
 
@@ -381,25 +383,29 @@ include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
 
-SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c acl.c android.c
+SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c \
+	utils.c netutils.c json.c jconf.c acl.c http.c tls.c rule.c \
+	android.c
 
 LOCAL_MODULE    := ss-local
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
 LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
 					-DUSE_CRYPTO_MBEDTLS -DANDROID -DHAVE_CONFIG_H \
 					-DCONNECT_IN_PROGRESS=EINPROGRESS \
+					-I$(LOCAL_PATH)/include/shadowsocks-libev \
 					-I$(LOCAL_PATH)/include \
 					-I$(LOCAL_PATH)/libancillary \
 					-I$(LOCAL_PATH)/mbedtls/include  \
+					-I$(LOCAL_PATH)/pcre \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libudns \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include/sodium \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libipset/include \
-					-I$(LOCAL_PATH)/shadowsocks-libev/libev \
-					-I$(LOCAL_PATH)/include/shadowsocks-libev
+					-I$(LOCAL_PATH)/shadowsocks-libev/libev
 
-LOCAL_STATIC_LIBRARIES := libev libmbedtls libipset libcork libudns libsodium libancillary
+LOCAL_STATIC_LIBRARIES := libev libmbedtls libipset libcork libudns \
+	libsodium libancillary libpcre
 
 LOCAL_LDLIBS := -llog
 
@@ -551,17 +557,55 @@ include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= mbedtls
+LOCAL_MODULE := mbedtls
 
-LOCAL_C_INCLUDES:= $(LOCAL_PATH)/mbedtls/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/mbedtls/include
 
-MBEDTLS_SOURCES  := $(wildcard $(LOCAL_PATH)/mbedtls/library/*.c)
+MBEDTLS_SOURCES := $(wildcard $(LOCAL_PATH)/mbedtls/library/*.c)
 
 LOCAL_SRC_FILES := $(MBEDTLS_SOURCES:$(LOCAL_PATH)/%=%)
 
-LOCAL_LDLIBS := -ldl -llog
+include $(BUILD_STATIC_LIBRARY)
+
+########################################################
+## pcre 
+########################################################
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := pcre 
+
+LOCAL_CFLAGS += -DHAVE_CONFIG_H
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/pcre/dist $(LOCAL_PATH)/pcre
+
+libpcre_src_files := \
+    pcre_chartables.c \
+    dist/pcre_byte_order.c \
+    dist/pcre_compile.c \
+    dist/pcre_config.c \
+    dist/pcre_dfa_exec.c \
+    dist/pcre_exec.c \
+    dist/pcre_fullinfo.c \
+    dist/pcre_get.c \
+    dist/pcre_globals.c \
+    dist/pcre_jit_compile.c \
+    dist/pcre_maketables.c \
+    dist/pcre_newline.c \
+    dist/pcre_ord2utf8.c \
+    dist/pcre_refcount.c \
+    dist/pcre_string_utils.c \
+    dist/pcre_study.c \
+    dist/pcre_tables.c \
+    dist/pcre_ucd.c \
+    dist/pcre_valid_utf8.c \
+    dist/pcre_version.c \
+    dist/pcre_xclass.c
+
+LOCAL_SRC_FILES := $(addprefix pcre/, $(libpcre_src_files))
 
 include $(BUILD_STATIC_LIBRARY)
 
 # Import cpufeatures
 $(call import-module,android/cpufeatures)
+

src/main/jni/include/shadowsocks-libev/config.h

@@ -417,3 +417,9 @@
 
 /* Define as `fork' if `vfork' does not work. */
 /* #undef vfork */
+
+/* Define to 1 if you have the <pcre.h> header file. */
+#define HAVE_PCRE_H 1
+
+/* Define to 1 if you have the <pcre/pcre.h> header file. */
+/* #undef HAVE_PCRE_PCRE_H */

src/main/res/drawable-v21/background_stat.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
     <item>
-        <color android:color="@color/material_accent_300"/>
+        <color android:color="@color/material_primary_300"/>
     </item>
 </ripple>

src/main/res/drawable/background_selectable.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/material_primary_300" />
+            <corners android:radius="4dp"/>
+        </shape>
+    </item>
+    <item android:left="8dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+            <corners android:bottomRightRadius="4dp" android:topRightRadius="4dp"/>
+        </shape>
+    </item>
+</layer-list>

src/main/res/drawable/background_selected.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/material_green_700" />
+            <corners android:radius="4dp"/>
+        </shape>
+    </item>
+    <item android:left="8dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+            <corners android:bottomRightRadius="4dp" android:topRightRadius="4dp"/>
+        </shape>
+    </item>
+</layer-list>

src/main/res/drawable/background_stat.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<color xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/material_accent_300"/>
+<color xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/material_primary_300"/>

src/main/res/drawable/ic_action_copyright.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10.08,10.86c0.05,-0.33 0.16,-0.62 0.3,-0.87s0.34,-0.46 0.59,-0.62c0.24,-0.15 0.54,-0.22 0.91,-0.23 0.23,0.01 0.44,0.05 0.63,0.13 0.2,0.09 0.38,0.21 0.52,0.36s0.25,0.33 0.34,0.53 0.13,0.42 0.14,0.64h1.79c-0.02,-0.47 -0.11,-0.9 -0.28,-1.29s-0.4,-0.73 -0.7,-1.01 -0.66,-0.5 -1.08,-0.66 -0.88,-0.23 -1.39,-0.23c-0.65,0 -1.22,0.11 -1.7,0.34s-0.88,0.53 -1.2,0.92 -0.56,0.84 -0.71,1.36S8,11.29 8,11.87v0.27c0,0.58 0.08,1.12 0.23,1.64s0.39,0.97 0.71,1.35 0.72,0.69 1.2,0.91 1.05,0.34 1.7,0.34c0.47,0 0.91,-0.08 1.32,-0.23s0.77,-0.36 1.08,-0.63 0.56,-0.58 0.74,-0.94 0.29,-0.74 0.3,-1.15h-1.79c-0.01,0.21 -0.06,0.4 -0.15,0.58s-0.21,0.33 -0.36,0.46 -0.32,0.23 -0.52,0.3c-0.19,0.07 -0.39,0.09 -0.6,0.1 -0.36,-0.01 -0.66,-0.08 -0.89,-0.23 -0.25,-0.16 -0.45,-0.37 -0.59,-0.62s-0.25,-0.55 -0.3,-0.88 -0.08,-0.67 -0.08,-1v-0.27c0,-0.35 0.03,-0.68 0.08,-1.01zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+</vector>

src/main/res/drawable/ic_action_delete.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+            android:fillColor="#FFFFFFFF"
+            android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+</vector>

src/main/res/drawable/ic_action_description.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
+</vector>

src/main/res/drawable/ic_action_done.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+            android:fillColor="#FFFFFFFF"
+            android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
 </vector>

src/main/res/drawable/ic_action_note_add.xml

@@ -5,5 +5,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
+        android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,16h-3v3h-2v-3L8,16v-2h3v-3h2v3h3v2zM13,9L13,3.5L18.5,9L13,9z"/>
 </vector>

src/main/res/drawable/ic_action_settings.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="#FF000000"
         android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
 </vector>

src/main/res/drawable/ic_arrow_drop_down.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M7,10l5,5 5,-5z"/>
-</vector>

src/main/res/drawable/ic_device_nfc.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,20L4,20L4,4h16v16zM18,6h-5c-1.1,0 -2,0.9 -2,2v2.28c-0.6,0.35 -1,0.98 -1,1.72 0,1.1 0.9,2 2,2s2,-0.9 2,-2c0,-0.74 -0.4,-1.38 -1,-1.72L13,8h3v8L8,16L8,8h2L10,6L6,6v12h12L18,6z"/>
-</vector>

src/main/res/drawable/ic_image_camera_alt.xml

@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
-</vector>

src/main/res/drawable/ic_image_edit.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="#FF000000"
         android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
 </vector>

src/main/res/drawable/ic_navigation_refresh.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>

src/main/res/drawable/ic_qu_camera_launcher.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="#f5f5f5"
+        android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0Z" />
+    <path
+        android:fillColor="#546e7a"
+        android:pathData="M24,21.8 C25.7673,21.8,27.2,23.2327,27.2,25 C27.2,26.7673,25.7673,28.2,24,28.2
+C22.2327,28.2,20.8,26.7673,20.8,25 C20.8,23.2327,22.2327,21.8,24,21.8 Z" />
+    <path
+        android:fillColor="#546e7a"
+        android:pathData="M21,15 L19.17,17 L16,17 A2,2,0,0,0,14,19 L14,31 A2,2,0,0,0,16,33 L32,33
+A2,2,0,0,0,34,31 L34,19 A2,2,0,0,0,32,17 L28.83,17 L27,15 Z M24,30
+A5,5,0,1,1,29,25 A5,5,0,0,1,24,30 Z" />
+</vector>

src/main/res/drawable/ic_qu_shadowsocks_launcher.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="#f5f5f5"
+        android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0Z" />
+    <path
+        android:fillColor="#546e7a"
+        android:pathData="M34,14.72 L30.52,30.04 L22.72,27.53 L29.61,19.31 L20.43,27.04 L14,24.62
+L34,14.72 Z" />
+    <path
+        android:fillColor="#546e7a"
+        android:pathData="M22.89,29.1 L25.38,29.9 L22.9,33.28 L22.89,29.1 Z" />
+</vector>

src/main/res/drawable/ic_start_busy.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
@@ -11,4 +10,4 @@
     <path
         android:fillColor="#fff"
         android:pathData="M 9.45 17.56 L 9.46 22 L 12.09 18.41 L 9.45 17.56 L 9.45 17.56 Z" />
-</vector>
+</vector>

src/main/res/drawable/ic_start_connected.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
@@ -11,4 +10,4 @@
     <path
         android:fillColor="#fff"
         android:pathData="M 9.45 17.56 L 12.09 18.41 L 9.46 22 L 9.45 17.56 Z" />
-</vector>
+</vector>

src/main/res/drawable/ic_start_idle.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
@@ -22,4 +21,4 @@
     <path
         android:fillColor="#fff"
         android:pathData="M8.56,8.56L0,12.8l6.83,2.57,4.64-3.9ZM6.44,13.08L5,12.55l5-2.47Z" />
-</vector>
+</vector>

src/main/res/layout/layout_about.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <include layout="@layout/toolbar_light_dark"/>
+    <WebView android:id="@+id/web_view"
+             android:layout_width="match_parent"
+             android:layout_height="0dp"
+             android:layout_weight="1"/>
+</LinearLayout>

src/main/res/layout/layout_global_settings.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <include layout="@layout/toolbar_light_dark" />
+    <FrameLayout android:id="@+id/content"
+                 android:layout_width="match_parent"
+                 android:layout_height="0dp"
+                 android:layout_weight="1"/>
+</LinearLayout>

src/main/res/layout/layout_header.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    <ImageView android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:adjustViewBounds="true"
+        android:scaleType="fitCenter"
+        android:src="@drawable/background_header"/>
+
+    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/drawer_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:text="shadowsocks"
+        android:gravity="center"
+        android:textSize="32sp"
+        android:textColor="@android:color/white"/>
+</RelativeLayout>

src/main/res/layout/layout_main.xml

@@ -3,87 +3,89 @@
                 xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent" android:layout_height="match_parent"
                 tools:ignore="UnknownIdInLayout" android:clipChildren="false">
-    <LinearLayout android:id="@+id/title_bar" android:layout_width="match_parent" android:layout_height="wrap_content"
-                  android:orientation="vertical" android:layout_below="@+id/toolbar"
-                  android:animateLayoutChanges="true">
-        <include layout="@layout/toolbar_light_dark" />
-        <LinearLayout android:id="@+id/stat" android:elevation="4dp" android:visibility="gone"
-                      android:layout_width="match_parent" android:layout_height="wrap_content"
-                      android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical"
-                      android:paddingStart="16dip" android:paddingEnd="16dip" android:focusable="true"
-                      android:paddingTop="16dip" android:paddingBottom="16dip"
-                      android:background="@drawable/background_stat" android:orientation="vertical"
-                      android:nextFocusRight="@+id/fab">
-            <LinearLayout android:layout_width="match_parent"
-                          android:layout_height="wrap_content">
-                <TextView android:text="@string/stat"
-                          android:textSize="16sp"
-                          android:textColor="?android:attr/textColorPrimary"
-                          android:ellipsize="marquee"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"/>
-                <TextView android:id="@+id/connection_test"
-                          android:gravity="end"
-                          android:textSize="14sp"
-                          android:textColor="?android:attr/textColorSecondary"
-                          android:layout_width="0dp"
-                          android:layout_height="wrap_content"
-                          android:layout_weight="1"/>
-            </LinearLayout>
-            <android.support.v7.widget.GridLayout android:layout_width="match_parent"
-                                                  android:layout_height="wrap_content"
-                                                  android:paddingEnd="72dip"
-                                                  app:columnCount="4">
-                <TextView app:layout_column="0" style="@style/TextAppearance.AppCompat.Body2"
-                          android:ellipsize="marquee" android:text="@string/sent"
-                          android:layout_width="wrap_content" android:layout_height="wrap_content"
-                          android:layout_marginEnd="24dp"
-                          android:gravity="end"/>
-                <TextView app:layout_column="1" android:id="@+id/tx" android:textSize="14sp"
-                          android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
-                          android:layout_width="0dp" android:layout_height="wrap_content"
-                          app:layout_columnWeight="1" app:layout_gravity="fill_horizontal"/>
-                <TextView app:layout_column="2" android:textSize="14sp"
-                          android:textColor="?android:attr/textColorSecondary"
-                          android:ellipsize="marquee" android:text="▲"
-                          android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-                <TextView app:layout_column="3" android:id="@+id/txRate" android:textSize="14sp"
-                          android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
-                          android:layout_width="0dp" android:layout_height="wrap_content" app:layout_columnWeight="1"
-                          app:layout_gravity="fill_horizontal" android:gravity="end"/>
-                <TextView app:layout_row="1" app:layout_column="0" style="@style/TextAppearance.AppCompat.Body2"
-                          android:layout_width="wrap_content" android:layout_height="wrap_content"
-                          android:layout_marginEnd="24dp"
-                          android:gravity="end"
-                          android:ellipsize="marquee" android:text="@string/received"/>
-                <TextView app:layout_row="1" app:layout_column="1" android:id="@+id/rx" android:textSize="14sp"
-                          android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
-                          android:layout_width="0dp" android:layout_height="wrap_content" app:layout_columnWeight="1"
-                          app:layout_gravity="fill_horizontal" />
-                <TextView app:layout_row="1" app:layout_column="2" android:textSize="14sp"
-                          android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
-                          android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="▼"/>
-                <TextView app:layout_row="1" app:layout_column="3" android:id="@+id/rxRate" android:textSize="14sp"
-                          android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
-                          android:layout_width="0dp" android:layout_height="wrap_content" app:layout_columnWeight="1"
-                          app:layout_gravity="fill_horizontal" android:gravity="end"/>
-            </android.support.v7.widget.GridLayout>
-        </LinearLayout>
+    <FrameLayout android:id="@+id/fragment_holder"
+                 android:layout_width="match_parent"
+                 android:layout_height="match_parent"
+                 android:layout_above="@+id/stat"/>
+    <LinearLayout android:id="@+id/stat"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:elevation="4dp"
+                  android:paddingStart="16dip"
+                  android:paddingEnd="16dip"
+                  android:paddingTop="16dip"
+                  android:paddingBottom="16dip"
+                  android:focusable="true"
+                  android:background="@drawable/background_stat"
+                  android:orientation="vertical"
+                  android:nextFocusRight="@+id/fab"
+                  android:layout_above="@+id/snackbar">
+        <TextView android:id="@+id/status"
+                  android:textSize="16sp"
+                  android:textColor="?android:attr/textColorPrimary"
+                  android:ellipsize="marquee"
+                  android:paddingEnd="72dip"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"/>
+        <com.github.shadowsocks.widget.BoundedGridLayout android:layout_width="match_parent"
+                                                         android:layout_height="wrap_content"
+                                                         app:bounded_width="288dp"
+                                                         app:columnCount="4">
+            <TextView app:layout_column="0" style="@style/TextAppearance.AppCompat.Body2"
+                      android:ellipsize="marquee" android:text="@string/sent"
+                      android:layout_width="wrap_content" android:layout_height="wrap_content"
+                      android:layout_marginEnd="24dp"
+                      android:gravity="end"/>
+            <TextView app:layout_column="1" android:id="@+id/tx" android:textSize="14sp"
+                      android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
+                      android:layout_width="0dp" android:layout_height="wrap_content"
+                      app:layout_columnWeight="1" app:layout_gravity="fill_horizontal"/>
+            <TextView app:layout_column="2" android:textSize="14sp"
+                      android:textColor="?android:attr/textColorSecondary"
+                      android:ellipsize="marquee" android:text="▲"
+                      android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+            <TextView app:layout_column="3" android:id="@+id/txRate" android:textSize="14sp"
+                      android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
+                      android:layout_width="0dp" android:layout_height="wrap_content" app:layout_columnWeight="1"
+                      app:layout_gravity="fill_horizontal" android:gravity="end"/>
+            <TextView app:layout_row="1" app:layout_column="0" style="@style/TextAppearance.AppCompat.Body2"
+                      android:layout_width="wrap_content" android:layout_height="wrap_content"
+                      android:layout_marginEnd="24dp"
+                      android:gravity="end"
+                      android:ellipsize="marquee" android:text="@string/received"/>
+            <TextView app:layout_row="1" app:layout_column="1" android:id="@+id/rx" android:textSize="14sp"
+                      android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
+                      android:layout_width="0dp" android:layout_height="wrap_content" app:layout_columnWeight="1"
+                      app:layout_gravity="fill_horizontal" />
+            <TextView app:layout_row="1" app:layout_column="2" android:textSize="14sp"
+                      android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
+                      android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="▼"/>
+            <TextView app:layout_row="1" app:layout_column="3" android:id="@+id/rxRate" android:textSize="14sp"
+                      android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
+                      android:layout_width="0dp" android:layout_height="wrap_content" app:layout_columnWeight="1"
+                      app:layout_gravity="fill_horizontal" android:gravity="end"/>
+        </com.github.shadowsocks.widget.BoundedGridLayout>
     </LinearLayout>
-    <fragment android:name="com.github.shadowsocks.ShadowsocksSettings"
-              android:id="@android:id/content" android:layout_below="@+id/title_bar"
-              android:layout_width="match_parent" android:layout_height="match_parent"/>
-    <com.github.jorgecastilloprz.FABProgressCircle android:id="@+id/fabProgressCircle" app:reusable="true"
+    <com.github.jorgecastilloprz.FABProgressCircle android:id="@+id/fabProgressCircle"
+                                                   app:reusable="true"
                                                    android:layout_width="wrap_content"
-                                                   android:layout_height="wrap_content" android:elevation="6dp"
-                                                   android:layout_alignBottom="@+id/title_bar"
+                                                   android:layout_height="wrap_content"
+                                                   android:elevation="6dp"
+                                                   android:layout_alignTop="@+id/stat"
                                                    android:layout_alignParentEnd="true"
                                                    android:layout_marginEnd="16dp"
-                                                   android:layout_marginBottom="@dimen/fab_margin_bottom">
-        <android.support.design.widget.FloatingActionButton android:id="@+id/fab" android:layout_width="wrap_content"
+                                                   android:layout_marginTop="@dimen/fab_margin_top">
+        <android.support.design.widget.FloatingActionButton android:id="@+id/fab"
+                                                            android:layout_width="wrap_content"
                                                             android:layout_height="wrap_content"
-                                                            app:backgroundTint="@color/material_blue_grey_700"
+                                                            app:backgroundTint="@color/material_primary_500"
                                                             app:srcCompat="@drawable/ic_start_idle"
-                                                            app:pressedTranslationZ="6dp" app:borderWidth="0dp" />
+                                                            app:pressedTranslationZ="6dp"
+                                                            app:borderWidth="0dp"/>
     </com.github.jorgecastilloprz.FABProgressCircle>
+    <android.support.design.widget.CoordinatorLayout
+        android:id="@+id/snackbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true" />
 </RelativeLayout>

src/main/res/layout/layout_profile_config.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <include layout="@layout/toolbar_light_dark" />
+    <fragment android:id="@+id/content"
+              class="com.github.shadowsocks.ProfileConfigFragment"
+              android:layout_width="match_parent"
+              android:layout_height="0dp"
+              android:layout_weight="1"/>
+</LinearLayout>

src/main/res/layout/layout_profiles.xml

@@ -1,68 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
               android:layout_width="match_parent"
-              android:orientation="vertical"
-              android:layout_height="match_parent">
-    <include layout="@layout/toolbar_light_dark" />
-    <android.support.design.widget.CoordinatorLayout android:layout_width="match_parent"
-                                                     android:layout_height="0dp" android:layout_weight="1">
-        <android.support.v7.widget.RecyclerView android:id="@+id/profilesList"
-                                                android:layout_width="match_parent"
-                                                android:layout_height="match_parent"/>
-        <com.github.clans.fab.FloatingActionMenu
-            android:id="@+id/menu"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="bottom|end"
-            android:layout_marginBottom="16dp"
-            android:layout_marginEnd="16dp"
-            app:menu_colorNormal="@color/material_accent_500"
-            app:menu_colorPressed="@color/material_accent_700"
-            app:fab_colorRipple="@android:color/white"
-            app:layout_behavior="com.github.shadowsocks.widget.FloatingActionMenuBehavior">
-
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/fab_manual_add"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:fab_colorNormal="@color/material_accent_500"
-                app:fab_colorPressed="@color/material_accent_700"
-                app:fab_colorRipple="@android:color/white"
-                app:fab_size="mini"
-                app:fab_label="@string/add_profile_methods_manual_settings"
-                />
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/fab_qrcode_add"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:fab_colorNormal="@color/material_accent_500"
-                app:fab_colorPressed="@color/material_accent_700"
-                app:fab_colorRipple="@android:color/white"
-                app:fab_size="mini"
-                app:fab_label="@string/add_profile_methods_scan_qr_code"
-                />
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/fab_nfc_add"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:fab_colorNormal="@color/material_accent_500"
-                app:fab_colorPressed="@color/material_accent_700"
-                app:fab_colorRipple="@android:color/white"
-                app:fab_size="mini"
-                app:fab_label="NFC"
-                />
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/fab_import_add"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:fab_colorNormal="@color/material_accent_500"
-                app:fab_colorPressed="@color/material_accent_700"
-                app:fab_colorRipple="@android:color/white"
-                app:fab_size="mini"
-                app:fab_label="@string/action_import"
-                />
-        </com.github.clans.fab.FloatingActionMenu>
-    </android.support.design.widget.CoordinatorLayout>
-
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+    <include layout="@layout/toolbar_light_dark"/>
+    <android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+                                            android:id="@+id/profilesList"
+                                            android:layout_width="match_parent"
+                                            android:layout_height="0dp"
+                                            android:layout_weight="1"
+                                            android:paddingBottom="32dp"
+                                            android:clipChildren="false"
+                                            android:clipToPadding="false"/>
 </LinearLayout>

src/main/res/layout/layout_profiles_item.xml

@@ -1,37 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Based on: https://github.com/android/platform_frameworks_base/blob/master/core/res/res/layout/select_dialog_singlechoice_material.xml -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:id="@+id/container"
-              android:background="?android:attr/selectableItemBackground"
-              android:paddingStart="20dp"
-              android:paddingEnd="?attr/dialogPreferredPadding"
-              android:focusable="true"
-              android:nextFocusRight="@+id/share">
-    <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
-                     android:id="@android:id/text1"
-                     android:layout_width="0dp"
-                     android:layout_height="wrap_content"
-                     android:layout_gravity="center_vertical"
-                     android:layout_weight="1"
-                     android:minHeight="?android:attr/listPreferredItemHeightSmall"
-                     android:textAppearance="?android:attr/textAppearanceMedium"
-                     android:textColor="?android:attr/textColorAlertDialogListItem"
-                     android:gravity="center_vertical"
-                     android:drawableStart="?android:attr/listChoiceIndicatorSingle"
-                     android:drawablePadding="20dp"
-                     android:maxLines="4"
-                     android:scrollHorizontally="false" />
-    <ImageView android:id="@+id/share"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:padding="5dp"
-               android:layout_gravity="center_vertical"
-               app:srcCompat="@drawable/ic_social_share"
-               android:background="?attr/selectableItemBackgroundBorderless"
-               android:contentDescription="@string/share"
-               android:focusable="true"
-               android:nextFocusLeft="@+id/container"/>
-</LinearLayout>
+<!-- Based on: https://github.com/android/platform_frameworks_base/blob/505e3ab/core/res/res/layout/simple_list_item_2.xml -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content">
+    <com.github.shadowsocks.widget.BoundedCardView android:layout_width="match_parent"
+                                                   android:layout_height="wrap_content"
+                                                   android:background="@drawable/background_selectable"
+                                                   android:layout_marginTop="8dp"
+                                                   android:layout_marginStart="8dp"
+                                                   android:layout_marginEnd="8dp"
+                                                   android:layout_gravity="center_horizontal"
+                                                   app:bounded_width="@dimen/profile_item_max_width"
+                                                   android:id="@+id/indicator">
+        <LinearLayout android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="8dp"
+            android:focusable="true"
+            android:nextFocusRight="@+id/edit"
+            android:id="@+id/content"
+            android:background="?android:attr/selectableItemBackground">
+            <LinearLayout android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:id="@+id/container">
+                <TextView android:id="@+id/title"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:gravity="center_vertical"
+                    android:maxLines="2"
+                    android:ellipsize="end"/>
+                <android.support.v7.widget.AppCompatImageView android:id="@+id/share"
+                                                              android:layout_width="wrap_content"
+                                                              android:layout_height="wrap_content"
+                                                              android:padding="4dp"
+                                                              android:layout_gravity="top"
+                                                              app:srcCompat="@drawable/ic_social_share"
+                                                              android:background="?attr/selectableItemBackgroundBorderless"
+                                                              android:contentDescription="@string/share"
+                                                              android:focusable="true"
+                                                              android:nextFocusLeft="@+id/container"/>
+                <android.support.v7.widget.AppCompatImageView android:id="@+id/edit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="4dp"
+                    android:layout_gravity="top"
+                    app:srcCompat="@drawable/ic_image_edit"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/edit"
+                    android:focusable="true"/>
+            </LinearLayout>
+            <LinearLayout android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="4dp"
+                android:id="@+id/details">
+                <TextView android:id="@+id/address"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="top"
+                    android:layout_weight="1"
+                    android:maxLines="2"
+                    android:ellipsize="end"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?android:attr/textColorSecondary"/>
+                <TextView android:id="@+id/traffic"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="top"
+                    android:ellipsize="end"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?android:attr/textColorSecondary"/>
+            </LinearLayout>
+        </LinearLayout>
+    </com.github.shadowsocks.widget.BoundedCardView>
+</FrameLayout>

src/main/res/layout/layout_quick_switch.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-    <include layout="@layout/toolbar_light_dark"/>
-
-    <android.support.v7.widget.RecyclerView
-            android:id="@+id/profilesList"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-</LinearLayout>

src/main/res/layout/layout_scanner.xml

@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <FrameLayout
-        android:id="@+id/content_frame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
+    android:layout_height="match_parent"
+    android:orientation="vertical">
     <include layout="@layout/toolbar_light_dark" />
-</FrameLayout>
+    <me.dm7.barcodescanner.zxing.ZXingScannerView android:id="@+id/scanner"
+                                                  android:layout_width="match_parent"
+                                                  android:layout_height="0dp"
+                                                  android:layout_weight="1"/>
+</LinearLayout>

src/main/res/menu/app_manager_menu.xml

@@ -2,10 +2,9 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/action_apply_all"
           android:title="@string/action_apply_all"
-          android:icon="@drawable/ic_done_all"
           android:alphabeticShortcut="a"
           android:numericShortcut="1"
-          app:showAsAction="always"/>
+          app:showAsAction="never"/>
     <item android:id="@+id/action_export"
           android:title="@string/action_export"
           android:icon="@drawable/ic_content_copy"

src/main/res/menu/profile_config_menu.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/action_delete"
+          android:title="@string/delete"
+          android:icon="@drawable/ic_action_delete"
+          android:alphabeticShortcut="d"
+          android:numericShortcut="2"
+          app:showAsAction="always"/>
+    <item android:id="@+id/action_apply"
+          android:title="@string/apply"
+          android:icon="@drawable/ic_action_done"
+          android:alphabeticShortcut="a"
+          android:numericShortcut="3"
+          app:showAsAction="always"/>
+</menu>

src/main/res/menu/profile_manager_menu.xml

@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:title="@string/add_profile"
+          android:icon="@drawable/ic_action_note_add"
+          android:alphabeticShortcut="a"
+          android:numericShortcut="0"
+          app:showAsAction="always">
+        <menu>
+            <item android:id="@+id/action_scan_qr_code"
+                  android:title="@string/add_profile_methods_scan_qr_code"
+                  android:alphabeticShortcut="s"
+                  android:numericShortcut="1"/>
+            <item android:id="@+id/action_import"
+                  android:title="@string/action_import"
+                  android:alphabeticShortcut="i"
+                  android:numericShortcut="2"/>
+            <item android:id="@+id/action_manual_settings"
+                  android:title="@string/add_profile_methods_manual_settings"
+                  android:alphabeticShortcut="m"
+                  android:numericShortcut="3"/>
+        </menu>
+    </item>
     <item android:id="@+id/action_export"
           android:title="@string/action_export"
           android:alphabeticShortcut="e"

src/main/res/menu/profile_share_popup.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/action_qr_code_nfc"
+          android:title="@string/share_qr_nfc"
+          android:alphabeticShortcut="q"
+          android:numericShortcut="1"/>
+    <item android:id="@+id/action_export"
+          android:title="@string/action_export"
+          android:alphabeticShortcut="e"
+          android:numericShortcut="2"/>
+</menu>

src/main/res/values-ja-v21/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="proxied_apps_summary">選択したアプリにプロキシを設定する</string>
+</resources>

src/main/res/values-ja/strings.xml

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">シャドーソックス</string>
+  <string name="quick_toggle">スイッチ</string>
+
+  <string name="misc_cat">その他</string>
+  <string name="proxy_cat">サーバー設定</string>
+  <string name="profile_name">サーバー名</string>
+  <string name="profile">プロファイル</string>
+  <string name="profile_summary">新規作成または既存ファイルを開く</string>
+  <string name="proxy">サーバーアドレス</string>
+  <string name="remote_port">リモートポート</string>
+  <string name="port">ローカルポート</string>
+  <string name="sitekey">パスワード</string>
+  <string name="enc_method">暗号化方式</string>
+  <string name="feature_cat">ファンクション設定</string>
+  <string name="http_proxy">HTTP プロキシサーバー</string>
+  <string name="http_proxy_summary">ローカル HTTP プロキシ</string>
+  <string name="dns_proxy">DNS プロキシ</string>
+  <string name="dns_proxy_summary">DNS解析をリモートサーバーにリダイレクト</string>
+  <string name="auto_set_gfwlist">CHN Route</string>
+  <string name="auto_set_gfwlist_summary">中国本土のサイトをすべて迂回する</string>
+  <string name="route_list">プロキシ方式</string>
+  <string name="proxied_apps">アプリ別のプロキシを使用</string>
+  <string name="proxied_apps_summary">アプリ別でプロキシを指定、Android 4.x では必ずNATモードを使用して下さい</string>
+  <string name="on">ON</string>
+  <string name="bypass_apps">バイパスモード（迂回モード）</string>
+  <string name="bypass_apps_summary">このモードを選択した場合、指定したアプリのパケットはプロキシを経由しない</string>
+  <string name="auto_connect">自動接続</string>
+  <string name="auto_connect_summary">システム起動時にバックグラウンドで本サービスを開始</string>
+  <string name="tcp_fastopen_summary">使用するにはROOT権限が必要</string>
+  <string name="tcp_fastopen_summary_unsupported">ご利用のカーネルバージョンはサポートしておりません：%s &lt; 3.7.1</string>
+  <string name="forward_success">バックグラウンドでサービスを開始しました</string>
+  <string name="service_failed">リモートサーバーに接続できません</string>
+  <string name="invalid_server">サーバーが無効です</string>
+  <string name="method_unsafe">注意：現在の暗号化方式は安全ではありません</string>
+  <string name="nat_deprecated">注意：Android 5.0及びそれ以降のバージョンではNATモードの使用はお勧めしません</string>
+  <string name="nat_no_root">NATモードはROOT権限が必要です</string>
+  <string name="switch_to_vpn">VPNモードに切り替える</string>
+  <string name="stop">中止</string>
+  <string name="stopping">停止中……</string>
+  <string name="vpn_error">バックグランドサービスの起動に失敗しました：%s</string>
+  <string name="reboot_required">VPNサービスの起動に失敗しました、デバイスの再起動を試みて下さい</string>
+  <string name="close">閉じる</string>
+  <string name="proxy_empty">サーバアドレスやパスワードの入力が必要です</string>
+  <string name="connect">接続</string>
+  <string name="initializing">初期化中……</string>
+  <string name="recovering">リセット中……</string>
+  <string name="loading">読み込み中……</string>
+  <string name="profiles">プロファイル</string>
+  <string name="settings">オプション設定</string>
+  <string name="remove_profile">このプロファイルを削除「%s」?</string>
+  <string name="recovery">リセット</string>
+  <string name="about">本アプリについて</string>
+  <string name="about_title">シャドーソックス（shadowsocks）%s</string>
+  <string name="flush_dnscache">DNS キャッシュをリフレッシュ</string>
+  <string name="flush_dnscache_summary">NATモードの場合のみ使用、ROOT権限が必要です</string>
+  <string name="flush_dnscache_no_root">ROOT権限がない場合はDNSキャッシュをリフレッシュできません</string>
+  <string name="flushing">リフレッシュ中……</string>
+  <string name="share">共有</string>
+  <string name="add_profile">プロファイルを追加</string>
+
+  <string name="nat">NAT モード (デバックのみ)</string>
+  <string name="nat_summary">VPNモードからNATモードに切り替えるにはROOT権限が必要です</string>
+  <string name="remote_dns">リモートDNS</string>
+
+  <string name="udp_dns">UDP転送</string>
+  <string name="udp_dns_summary">UDPプロトコルでリモードサーバーにパケットを転送</string>
+
+  <string name="onetime_auth">ワンタイム認証</string>
+  <string name="onetime_auth_summary">ワンタイム認証を使用する</string>
+
+  <string name="ipv6">IPv6プロキシ</string>
+  <string name="ipv6_summary">リモートサーバーにIPv6パケットを転送</string>
+
+  <string name="stat_summary">送信済み: \t%3$s\t↑\t%1$s/s\n受信済み: \t%4$s\t↓\t%2$s/s</string>
+
+  <string name="connection_test_pending">接続状況確認</string>
+  <string name="connection_test_testing">テスト中...</string>
+  <string name="connection_test_available">成功: %dmsの遅延</string>
+  <string name="connection_test_fail">インターネット利用不可</string>
+  <string name="connection_test_error">失敗しました：%s</string>
+  <string name="connection_test_error_status_code">ステータスコード無効（#%d）</string>
+
+  <!-- profile -->
+  <string name="copy_url">URL をコピー</string>
+  <string name="add_profile_dialog">シャドーソックスにプロファイルを追加しますか</string>
+  <string name="add_profile_methods_scan_qr_code">QRコードを読み取る</string>
+  <string name="add_profile_methods_manual_settings">手動でセットアップ</string>
+  <string name="add_profile_scanner_permission_required">QRコードを読み取るにはカメラの使用権限が必要です。</string>
+
+  <string-array name="route_entry">
+    <item>すべて</item>
+    <item>LANアドレスを迂回する</item>
+    <item>中国本土のアドレスを迂回する</item>
+    <item>LAN及び中国本土のアドレスを迂回する</item>
+    <item>中国本土からアクセス不可なアドレス以外を迂回する</item>
+    <item>中国本土のアドレス以外を迂回する</item>
+  </string-array>
+
+  <string name="action_apply_all">設定をすべてのプロファイルに適応する</string>
+  <string name="action_export">クリップボードに出力</string>
+  <string name="action_import">クリップボードからインポート</string>
+  <string name="action_export_msg">クリップボードの出力に成功しました</string>
+  <string name="action_export_err">クリップボードの出力に失敗しました</string>
+  <string name="action_import_msg">インポートは成功しました</string>
+  <string name="action_import_err">インポートは失敗しました</string>
+
+  <plurals name="removed">
+    <item quantity="one">削除済み</item>
+    <item quantity="other">%d を削除しました</item>
+  </plurals>
+  <string name="undo">戻る</string>
+  <string name="toggle_service_state">サービスを開始</string>
+  <string name="start_service_default">現在のサーバーに接続する</string>
+  <string name="start_service">%s に接続</string>
+  <string name="stop_service">%s に切り替え</string>
+  <string name="profile_default">現在のプロファイルを使用する</string>
+
+  <!-- status -->
+  <string name="sent">送信済み:</string>
+  <string name="received">受信済み:</string>
+
+  <!-- kcp -->
+  <string name="kcp_summary">KCP プロトコル を有効にする</string>
+  <string name="kcp_port">KCP ポート</string>
+  <string name="kcp_port_summary">%d（リモート KCPTUN サーバーのポート番号）</string>
+  <string name="kcpcli">KCP パラメータ</string>
+
+</resources>

src/main/res/values-ru/strings.xml

@@ -9,7 +9,6 @@
   <string name="profile_summary">Переключить на другой профиль или добавить новые</string>
   <string name="nat">Режим NAT (не рекомендуется)</string>
   <string name="nat_summary">Использовать режим NAT вместо VPN. Требует ROOT прав.</string>
-  <string name="stat">Сетевая Активность</string>
   <string name="stat_summary">Отправлено: \t\t\t\t\t%3$s\t↑\t%1$s/s\nПолучено: \t%4$s\t↓\t%2$s/s</string>
   <string name="stat_profiles">\n%1$s↑\t%2$s↓</string>
   <string name="traffic_summary">%1$s/s↑\t%2$s/s↓</string>
@@ -24,13 +23,9 @@
   <string name="proxy_cat">Настройки Сервера</string>
   <string name="profile_name">Имя Профиля</string>
   <string name="proxy">Сервер</string>
-  <string name="proxy_summary">Имя или IP удалённого сервера</string>
   <string name="remote_port">Удалённый порт</string>
-  <string name="remote_port_summary">%d (номер порта удалённого сервера)</string>
   <string name="port">Локальный порт</string>
-  <string name="port_summary">%d (номер порта локального сервера)</string>
   <string name="sitekey">Пароль</string>
-  <string name="sitekey_summary">Пароль удалённого сервера</string>
   <string name="enc_method">Метод Шифрования</string>
 
   <!-- feature category -->
@@ -46,6 +41,14 @@
   <string name="auto_set_gfwlist">CHN Маршрут</string>
   <string name="auto_set_gfwlist_summary">Игнорировать все сайты находящиеся в Китае</string>
   <string name="route_list">Маршрут</string>
+  <string-array name="route_entry">
+    <item>Все</item>
+    <item>Обход LAN</item>
+    <item>Обходной Китай</item>
+    <item>Обход LAN и Китай</item>
+    <item>Список GFW</item>
+    <item>Список Китай</item>
+  </string-array>
   <string name="proxied_apps">Прокси для выбранных приложений</string>
   <string name="proxied_apps_summary">Установить прокси для выбранных приложений, требует режим NAT под Android 4.x</string>
   <string name="on">Вкл</string>
@@ -70,7 +73,6 @@
   <string name="stopping">Останавливается…</string>
   <string name="vpn_error">%s</string>
   <string name="reboot_required">Сбой запуска VPN сервиса. Требуется перезагрузка Вашего устройства.</string>
-  <string name="quick_switch">Переключить</string>
 
   <!-- alert category -->
   <string name="close">Закрыть</string>
@@ -85,14 +87,9 @@
   <string name="profiles">Профили</string>
   <string name="settings">Настройки</string>
   <string name="recovery">Сброс</string>
-  <string name="recovery_summary">Сброс всех фоновых задач</string>
   <string name="about">О приложении</string>
   <string name="about_title">Shadowsocks %s</string>
   <string name="share">Поделиться</string>
-  <string name="share_message">Сканировать QR код или использовать Android Beam (NFC)</string>
-  <string name="share_message_without_nfc">Сканировать QR код</string>
-  <string name="share_message_nfc_disabled">Сканировать QR код\nAndroid Beam отключен</string>
-  <string name="turn_on_nfc">Включить NFC &amp; Android Beam</string>
   <string name="flush_dnscache">Очистить кэш DNS</string>
   <string name="flush_dnscache_summary">Работает только в режиме NAT. Требует наличия ROOT прав.</string>
   <string name="flush_dnscache_no_root">Очистка кэша DNS не работает без налиичя ROOT прав</string>
@@ -108,15 +105,9 @@
   <string name="action_import_err">Сбой импорта.</string>
 
   <!-- profile -->
-  <string name="profile_manager_dialog">Profiles</string>
-  <string name="profile_manager_dialog_content">&#8226; Нажмите для выбора профиля;\n&#8226; Сдвиньте влево/вправо или нажмите влево
-    чтобы удалить;\n&#8226; Подержите чтобы изменить порядок профилей.</string>
-  <string name="gotcha">Gotcha!</string>
   <string name="add_profile_dialog">Добавить этот Профиль Shadowsocks?</string>
   <string name="add_profile_methods_scan_qr_code">Сканировать QR код</string>
   <string name="add_profile_methods_manual_settings">Настройка вручную</string>
-  <string name="add_profile_nfc_hint_title">Использовать Android Beam (NFC) для добавления профиля</string>
-  <string name="add_profile_nfc_hint">Оставьте экран включённым на обоих устройствах, на втором устойстве нажмите кнопку профиля "поделиться", поднисите устройства друг к другу (тыльными сторонами).\nТак же Вы можете сканировать nfc метку.</string>
   <string name="add_profile_scanner_permission_required">Разрешение камеры требуется для сканирования QR код.</string>
   <string name="copy_url">Копировать URL</string>
   <plurals name="removed">
@@ -141,5 +132,4 @@
   <string name="kcp_port">KCP порт</string>
   <string name="kcp_port_summary">%d (KCPTUN омер порта удалённого сервера)</string>
   <string name="kcpcli">KCP параметры</string>
-  <string name="kcpcli_summary">Командная строка KCPTUN</string>
 </resources>

src/main/res/values-v21/dimen.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="fab_margin_bottom">-28dp</dimen>
+    <dimen name="fab_margin_top">-28dp</dimen>
 </resources>

src/main/res/values-v21/styles.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.Material" parent="Theme.MaterialBase"/>
+</resources>

src/main/res/values-zh-rCN/strings.xml

@@ -9,13 +9,9 @@
   <string name="profile">配置文件</string>
   <string name="profile_summary">新建或切换到其他配置文件</string>
   <string name="proxy">服务器</string>
-  <string name="proxy_summary">远程服务器的地址</string>
   <string name="remote_port">远程端口</string>
-  <string name="remote_port_summary">%d（远程服务器的端口号）</string>
   <string name="port">本地端口</string>
-  <string name="port_summary">%d（本地客户端的端口号）</string>
   <string name="sitekey">密码</string>
-  <string name="sitekey_summary">远程服务器的密码</string>
   <string name="enc_method">加密方法</string>
   <string name="feature_cat">功能设置</string>
   <string name="http_proxy">HTTP 代理服务器</string>
@@ -42,11 +38,13 @@
   <string name="nat_no_root">NAT 模式需要 ROOT 权限</string>
   <string name="switch_to_vpn">切换到 VPN 模式</string>
   <string name="stop">停止</string>
-  <string name="quick_switch">切换</string>
   <string name="stopping">正在关闭……</string>
   <string name="vpn_error">后台服务启动失败：%s</string>
   <string name="reboot_required">VPN 服务启动失败。你可能需要重启设备。</string>
+  <string name="yes">是</string>
+  <string name="no">否</string>
   <string name="close">关闭</string>
+  <string name="profile_empty">请选择配置文件</string>
   <string name="proxy_empty">代理服务器地址及密码不能为空</string>
   <string name="connect">连接</string>
   <string name="initializing">正在初始化……</string>
@@ -56,22 +54,19 @@
   <string name="settings">设置选项</string>
   <string name="remove_profile">删除此配置文件「%s」?</string>
   <string name="recovery">重置</string>
-  <string name="recovery_summary">重置所有后台服务</string>
   <string name="about">关于</string>
   <string name="about_title">影梭（shadowsocks）%s</string>
   <string name="flush_dnscache">刷新 DNS 缓存</string>
   <string name="flush_dnscache_summary">只需在 NAT 模式下使用，需要 ROOT 权限</string>
   <string name="flush_dnscache_no_root">在没有 ROOT 权限的情况下无法刷新 DNS 缓存</string>
   <string name="flushing">刷新中……</string>
+  <string name="edit">编辑</string>
   <string name="share">分享</string>
-  <string name="share_message">扫描二维码或使用 Android Beam (NFC)</string>
-  <string name="share_message_without_nfc">扫描二维码</string>
-  <string name="share_message_nfc_disabled">扫描二维码\nAndroid Beam 被禁用</string>
-  <string name="turn_on_nfc">打开 NFC &amp; Android Beam</string>
   <string name="add_profile">添加配置文件</string>
 
   <string name="nat">NAT 模式 (仅限调试)</string>
   <string name="nat_summary">从 VPN 模式切换为 NAT 模式，需要 ROOT 权限</string>
+  <string name="remote_dns">远程 DNS</string>
 
   <string name="udp_dns">UDP 转发</string>
   <string name="udp_dns_summary">由远程服务器转发 UDP 协议的数据包</string>
@@ -82,7 +77,6 @@
   <string name="ipv6">IPv6 路由</string>
   <string name="ipv6_summary">向远程服务器转发 IPv6 流量</string>
 
-  <string name="stat">网络流量</string>
   <string name="stat_summary">发送: \t%3$s\t↑\t%1$s/s\n接收: \t%4$s\t↓\t%2$s/s</string>
 
   <string name="connection_test_pending">检查网络连接</string>
@@ -93,16 +87,16 @@
   <string name="connection_test_error_status_code">状态码无效（#%d）</string>
 
   <!-- profile -->
-  <string name="profile_manager_dialog">配置文件</string>
-  <string name="profile_manager_dialog_content">&#8226; 点击选择配置文件；\n&#8226; 向左/右滑动或按左删除；\n&#8226;
-    长按拖动改变顺序。</string>
-  <string name="gotcha">好的</string>
+  <string name="profile_config">配置文件设置</string>
+  <string name="unsaved_changes_prompt">保存修改吗？</string>
+  <string name="apply">应用</string>
+  <string name="delete">删除</string>
+  <string name="delete_confirm_prompt">你是否确定要删除这个配置文件？</string>
+  <string name="share_qr_nfc">二维码 / NFC</string>
   <string name="copy_url">复制 URL</string>
   <string name="add_profile_dialog">为影梭添加此配置文件？</string>
   <string name="add_profile_methods_scan_qr_code">扫描二维码</string>
   <string name="add_profile_methods_manual_settings">手动设置</string>
-  <string name="add_profile_nfc_hint_title">使用 Android Beam (NFC) 来添加配置</string>
-  <string name="add_profile_nfc_hint">保持两台设备的屏幕亮起，在另外一台设备上，点击配置文件的分享按钮，将它们靠在一起（背靠背）。\n你也可以扫描 NFC 标签。</string>
   <string name="add_profile_scanner_permission_required">扫描二维码需要相机权限。</string>
 
   <string-array name="route_entry">
@@ -110,6 +104,8 @@
     <item>绕过局域网地址</item>
     <item>绕过中国大陆地址</item>
     <item>绕过局域网及中国大陆地址</item>
+    <item>仅代理中国大陆无法访问的地址</item>
+    <item>仅代理中国大陆地址</item>
   </string-array>
 
   <string name="action_apply_all">应用设置到所有配置文件</string>
@@ -134,12 +130,15 @@
   <!-- status -->
   <string name="sent">发送:</string>
   <string name="received">接收:</string>
+  <string name="connecting">连接中…</string>
+  <string name="vpn_connected">已连接, 轻触以检查连接状态</string>
+  <string name="nat_connected">已连接</string>
+  <string name="not_connected">未连接</string>
 
   <!-- kcp -->
   <string name="kcp_summary">启用 KCP 协议</string>
   <string name="kcp_port">KCP 端口</string>
   <string name="kcp_port_summary">%d（远端 KCPTUN 服务器的端口号）</string>
   <string name="kcpcli">KCP 参数</string>
-  <string name="kcpcli_summary">KCPTUN 的命令行参数</string>
 
 </resources>

src/main/res/values-zh-rTW/strings.xml

@@ -10,13 +10,9 @@
   <string name="profile">設定檔</string>
   <string name="profile_summary">切換至其他設定檔或新增新設定檔</string>
   <string name="proxy">伺服器</string>
-  <string name="proxy_summary">遠端伺服器的 IP 位址或主機名稱</string>
   <string name="remote_port">遠端連接埠</string>
-  <string name="remote_port_summary">%d（遠端伺服器的連接埠號碼）</string>
   <string name="port">連接埠號碼</string>
-  <string name="port_summary">%d（本機伺服器的連接埠號碼）</string>
   <string name="sitekey">密碼</string>
-  <string name="sitekey_summary">遠端伺服器的密碼</string>
   <string name="enc_method">加密方法</string>
   <string name="feature_cat">功能設定</string>
   <string name="http_proxy">HTTP Proxy</string>
@@ -43,11 +39,13 @@
   <string name="nat_no_root">NAT 模式需要 ROOT 權限</string>
   <string name="switch_to_vpn">切換至 VPN 模式</string>
   <string name="stop">停止</string>
-  <string name="quick_switch">切換</string>
   <string name="stopping">關閉中……</string>
   <string name="vpn_error">%s</string>
   <string name="reboot_required">VPN 服務啟動失敗。您或許需要重新啟動您的裝置。</string>
+  <string name="yes">是</string>
+  <string name="no">否</string>
   <string name="close">關閉</string>
+  <string name="profile_empty">請選擇設定檔</string>
   <string name="proxy_empty">Proxy 或密碼不可以空白</string>
   <string name="connect">連線</string>
   <string name="initializing">起始中……</string>
@@ -57,22 +55,19 @@
   <string name="settings">設定</string>
   <string name="remove_profile">移除此設定檔 "%s"?</string>
   <string name="recovery">重設</string>
-  <string name="recovery_summary">重設一切背景服務</string>
   <string name="about">關於</string>
   <string name="about_title">Shadowsocks %s</string>
   <string name="flush_dnscache">清除 DNS 快取</string>
   <string name="flush_dnscache_summary">僅在 NAT 模式可用，需要 ROOT 權限</string>
   <string name="flush_dnscache_no_root">在無 ROOT 權限時清除 DNS 快取無法進行</string>
   <string name="flushing">清除中……</string>
+  <string name="edit">編輯</string>
   <string name="share">分享</string>
-  <string name="share_message">掃描 QR 碼或者使用 Android Beam (NFC)</string>
-  <string name="share_message_without_nfc">掃描 QR 碼</string>
-  <string name="share_message_nfc_disabled">掃描 QR 碼\nAndroid Beam 被停用</string>
-  <string name="turn_on_nfc">啟用 NFC &amp; Android Beam</string>
   <string name="add_profile">新增設定檔</string>
 
   <string name="nat">NAT 模式 (已過時)</string>
   <string name="nat_summary">使用 NAT 模式代替 VPN 模式，需要 ROOT 權限</string>
+  <string name="remote_dns">遠程 DNS</string>
 
   <string name="udp_dns">UDP 轉送</string>
   <string name="udp_dns_summary">向遠端轉送 UDP 封包</string>
@@ -83,7 +78,6 @@
   <string name="ipv6">IPv6 路由</string>
   <string name="ipv6_summary">向遠端重新導向 IPv6 流量</string>
 
-  <string name="stat">網路流量</string>
   <string name="stat_summary">傳送: \t%3$s\t↑\t%1$s/s\n接收: \t%4$s\t↓\t%2$s/s</string>
 
   <string name="connection_test_pending">檢查連線能力</string>
@@ -94,17 +88,16 @@
   <string name="connection_test_error_status_code">錯誤碼: #%d</string>
 
   <!-- profile -->
-  <string name="profile_manager_dialog">設定檔</string>
-  <string name="profile_manager_dialog_content">&#8226; 輕觸選擇一個設定檔；\n&#8226; 向左/右撥動或按左移除；\n&#8226;
-    按住後上下撥動設定檔重新排序。</string>
-  <string name="gotcha">我懂了！</string>
+  <string name="profile_config">設定檔配置</string>
+  <string name="unsaved_changes_prompt">要保存更改嗎？</string>
+  <string name="apply">應用</string>
+  <string name="delete">刪除</string>
+  <string name="delete_confirm_prompt">您確定要移除這個設定檔嗎？</string>
+  <string name="share_qr_nfc">QR 碼 / NFC</string>
   <string name="copy_url">複製 URL</string>
   <string name="add_profile_dialog">為 Shadowsocks 新增此設定檔？</string>
   <string name="add_profile_methods_scan_qr_code">掃描 QR 碼</string>
   <string name="add_profile_methods_manual_settings">手動設定</string>
-  <string name="add_profile_nfc_hint_title">使用 Android Beam (NFC) 來新增設定檔</string>
-  <string name="add_profile_nfc_hint">
-    保持兩台設備的屏幕亮起，在另外一台設備上，點擊設定檔的分享按鈕，將它們靠在一起（背靠背）。\n你也可以掃描 NFC 標籤。</string>
   <string name="add_profile_scanner_permission_required">掃描 QR 碼需要相機權限。</string>
 
   <string-array name="route_entry">
@@ -112,6 +105,8 @@
     <item>略過區域網路位址</item>
     <item>略過中國大陸位址</item>
     <item>略過區域網路及中國大陸位址</item>
+    <item>僅代理大陸屏蔽位址</item>
+    <item>僅代理大陸位址</item>
   </string-array>
 
   <string name="action_apply_all">應用設置到所有配置文件</string>
@@ -136,12 +131,15 @@
   <!-- status -->
   <string name="sent">傳送:</string>
   <string name="received">接收:</string>
+  <string name="connecting">連線中…</string>
+  <string name="vpn_connected">已連線, 輕觸以檢查連線能力</string>
+  <string name="nat_connected">已連線</string>
+  <string name="not_connected">未連線</string>
 
   <!-- kcp -->
   <string name="kcp_summary">啟用 KCP 協定</string>
   <string name="kcp_port">KCP 連接埠</string>
   <string name="kcp_port_summary">%d（遠端 KCPTUN 伺服器的連接埠號碼）</string>
   <string name="kcpcli">KCP 參數</string>
-  <string name="kcpcli_summary">KCPTUN 的命令行參數</string>
 
 </resources>

src/main/res/values/arrays.xml

@@ -38,35 +38,13 @@
         <item>chacha20-ietf</item>
     </string-array>
 
-    <string-array name="route_entry">
-        <item>All</item>
-        <item>Bypass LAN</item>
-        <item>Bypass China</item>
-        <item>Bypass LAN &amp; China</item>
-    </string-array>
-
     <string-array name="route_value">
         <item>all</item>
         <item>bypass-lan</item>
         <item>bypass-china</item>
         <item>bypass-lan-china</item>
-    </string-array>
-
-    <string-array name="private_route">
-        <item>0.0.0.0/8</item>
-        <item>10.0.0.0/8</item>
-        <item>100.64.0.0/10</item>
-        <item>127.0.0.0/8</item>
-        <item>169.254.0.0/16</item>
-        <item>172.16.0.0/12</item>
-        <item>192.0.0.0/29</item>
-        <item>192.0.2.0/24</item>
-        <item>192.88.99.0/24</item>
-        <item>192.168.0.0/16</item>
-        <item>198.18.0.0/15</item>
-        <item>198.51.100.0/24</item>
-        <item>203.0.113.0/24</item>
-        <item>224.0.0.0/3</item>
+        <item>gfwlist</item>
+        <item>china-list</item>
     </string-array>
 
     <string-array name="bypass_private_route">

src/main/res/values/attrs.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <declare-styleable name="DropDownPreference">
-        <attr name="android:entries" />
-        <attr name="android:entryValues" />
+    <declare-styleable name="BoundedView">
+        <attr name="bounded_width" format="dimension" />
+        <attr name="bounded_height" format="dimension" />
     </declare-styleable>
     <declare-styleable name="NumberPickerPreference">
         <attr name="max" format="integer" />

src/main/res/values/colors.xml

@@ -3,11 +3,13 @@
 <resources>
 
   <color name="material_green_700">#388E3C</color>
+  <color name="material_green_a700">#00C853</color>
   <color name="material_blue_grey_300">#90A4AE</color>
   <color name="material_blue_grey_500">#607D8B</color>
   <color name="material_blue_grey_700">#455A64</color>
-  <color name="material_accent_300">@color/material_blue_grey_300</color>
-  <color name="material_accent_500">@color/material_blue_grey_500</color>
-  <color name="material_accent_700">@color/material_blue_grey_700</color>
+  <color name="material_primary_300">@color/material_blue_grey_300</color>
+  <color name="material_primary_500">@color/material_blue_grey_500</color>
+  <color name="material_primary_700">@color/material_blue_grey_700</color>
+  <color name="material_accent_200">@color/material_green_a700</color>
 
 </resources>

src/main/res/values/dimen.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="profile_item_max_width">480dp</dimen>
     <!-- TODO: Remove when this issue is fixed: https://github.com/JorgeCastilloPrz/FABProgressCircle/issues/19 -->
-    <dimen name="fab_margin_bottom">-44dp</dimen>
+    <dimen name="fab_margin_top">-44dp</dimen>
 </resources>

src/main/res/values/strings.xml

@@ -10,9 +10,9 @@
   <string name="profile_summary">Switch to another profile or add new profiles</string>
   <string name="nat">NAT mode (deprecated)</string>
   <string name="nat_summary">Use NAT mode instead of VPN mode. Requires ROOT permission.</string>
-  <string name="stat">Network Traffic</string>
+  <string name="remote_dns">Remote DNS</string>
   <string name="stat_summary">Sent: \t\t\t\t\t%3$s\t↑\t%1$s/s\nReceived: \t%4$s\t↓\t%2$s/s</string>
-  <string name="stat_profiles">\n%1$s↑\t%2$s↓</string>
+  <string name="stat_profiles">%1$s↑\t%2$s↓</string>
   <string name="traffic_summary">%1$s/s↑\t%2$s/s↓</string>
   <plurals name="bytes" translatable="false">
     <item quantity="one">Byte</item>
@@ -29,13 +29,9 @@
   <string name="proxy_cat">Server Settings</string>
   <string name="profile_name">Profile Name</string>
   <string name="proxy">Server</string>
-  <string name="proxy_summary">Hostname or IP of the remote server</string>
   <string name="remote_port">Remote Port</string>
-  <string name="remote_port_summary">%d (port number of the remote server)</string>
   <string name="port">Local Port</string>
-  <string name="port_summary">%d (port number of the local server)</string>
   <string name="sitekey">Password</string>
-  <string name="sitekey_summary">Password of the remote server</string>
   <string name="enc_method">Encrypt Method</string>
 
   <!-- feature category -->
@@ -52,6 +48,14 @@
   <string name="auto_set_gfwlist_summary">Bypass all sites located in China
   </string>
   <string name="route_list">Route</string>
+  <string-array name="route_entry">
+    <item>All</item>
+    <item>Bypass LAN</item>
+    <item>Bypass China</item>
+    <item>Bypass LAN &amp; China</item>
+    <item>GFW List</item>
+    <item>China List</item>
+  </string-array>
   <string name="proxied_apps">Per-App Proxy</string>
   <string name="proxied_apps_summary">Set proxy for selected apps, requires NAT mode under Android 4.x</string>
   <string name="on">On</string>
@@ -76,10 +80,13 @@
   <string name="stopping">Shutting down…</string>
   <string name="vpn_error">%s</string>
   <string name="reboot_required">Failed to start VPN service. You might need to reboot your device.</string>
-  <string name="quick_switch">Switch</string>
+  <string name="profile_invalid_input">No valid profile data found.</string>
 
   <!-- alert category -->
+  <string name="yes">Yes</string>
+  <string name="no">No</string>
   <string name="close">Close</string>
+  <string name="profile_empty">Please select a profile</string>
   <string name="proxy_empty">Proxy/Password should not be empty</string>
   <string name="connect">Connect</string>
   <string name="initializing">Initializing…</string>
@@ -91,14 +98,10 @@
   <string name="profiles">Profiles</string>
   <string name="settings">Settings</string>
   <string name="recovery">Reset</string>
-  <string name="recovery_summary">Reset all the background services</string>
   <string name="about">About</string>
   <string name="about_title">Shadowsocks %s</string>
+  <string name="edit">Edit</string>
   <string name="share">Share</string>
-  <string name="share_message">Scan QR code or use Android Beam (NFC)</string>
-  <string name="share_message_without_nfc">Scan QR code</string>
-  <string name="share_message_nfc_disabled">Scan QR code\nAndroid Beam is disabled</string>
-  <string name="turn_on_nfc">Turn on NFC &amp; Android Beam</string>
   <string name="flush_dnscache">Flush DNS cache</string>
   <string name="flush_dnscache_summary">Only useful in NAT mode. Requires ROOT permission.</string>
   <string name="flush_dnscache_no_root">Flush DNS cache cannot proceed without ROOT permission</string>
@@ -113,15 +116,15 @@
   <string name="action_import_err">Failed to import.</string>
 
   <!-- profile -->
-  <string name="profile_manager_dialog">Profiles</string>
-  <string name="profile_manager_dialog_content">&#8226; Tap to select a profile;\n&#8226; Swipe left/right or press left
-    to remove;\n&#8226; Long press to reorder profiles.</string>
-  <string name="gotcha">Gotcha!</string>
+  <string name="profile_config">Profile config</string>
+  <string name="unsaved_changes_prompt">Changes not saved. Do you want to save?</string>
+  <string name="apply">Apply</string>
+  <string name="delete">Remove</string>
+  <string name="delete_confirm_prompt">Are you sure you want to remove this profile?</string>
+  <string name="share_qr_nfc">QR code/NFC</string>
   <string name="add_profile_dialog">Add this Shadowsocks Profile?</string>
   <string name="add_profile_methods_scan_qr_code">Scan QR code</string>
   <string name="add_profile_methods_manual_settings">Manual Settings</string>
-  <string name="add_profile_nfc_hint_title">Use Android Beam (NFC) to add profile</string>
-  <string name="add_profile_nfc_hint">Keep both devices screen on, on the other device, click profile\'s share button, bring them together (back to back).\nYou also can scan a nfc tag.</string>
   <string name="add_profile_scanner_permission_required">Camera permission is required for scanning QR code.</string>
   <string name="copy_url">Copy URL</string>
   <plurals name="removed">
@@ -140,6 +143,10 @@
   <!-- status -->
   <string name="sent">Sent:</string>
   <string name="received">Received:</string>
+  <string name="connecting">Connecting…</string>
+  <string name="vpn_connected">Connected, tap to check connection</string>
+  <string name="nat_connected">Connected</string>
+  <string name="not_connected">Not connected</string>
 
   <!-- kcp -->
   <string name="kcp" translatable="false">KCP</string>
@@ -147,5 +154,4 @@
   <string name="kcp_port">KCP Port</string>
   <string name="kcp_port_summary">%d (port number of the remote KCPTUN server)</string>
   <string name="kcpcli">KCP Parameters (CLI)</string>
-  <string name="kcpcli_summary">The command line of KCPTUN</string>
 </resources>

src/main/res/values/styles.xml

@@ -6,19 +6,48 @@
         <item name="android:textSize">24sp</item>
     </style>
 
-    <style name="Theme.Material" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:navigationBarColor">@color/material_accent_700</item>
-        <item name="colorAccent">@color/material_accent_500</item>
-        <item name="colorButtonNormal">@color/material_accent_500</item>
-        <item name="colorPrimary">@color/material_accent_500</item>
-        <item name="colorPrimaryDark">@color/material_accent_700</item>
+    <style name="Theme.MaterialBase" parent="MaterialDrawerTheme.Light.DarkToolbar">
+        <!--suppress NewApi -->
+        <item name="android:navigationBarColor">@color/material_primary_700</item>
+        <item name="colorAccent">@color/material_accent_200</item>
+        <item name="colorButtonNormal">@color/material_accent_200</item>
+        <item name="colorPrimary">@color/material_primary_500</item>
+        <item name="colorPrimaryDark">@color/material_primary_700</item>
+        <item name="preferenceTheme">@style/Theme.Material.PreferenceThemeOverlay</item>
+
+        <item name="material_drawer_selected_text">@color/material_accent_200</item>
     </style>
 
     <style name="Theme.Material.Dialog" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/material_accent_500</item>
-        <item name="colorPrimary">@color/material_accent_500</item>
-        <item name="colorPrimaryDark">@color/material_accent_700</item>
+        <item name="colorAccent">@color/material_primary_500</item>
+        <item name="colorButtonNormal">@color/material_accent_200</item>
+        <item name="colorPrimary">@color/material_primary_500</item>
+        <item name="colorPrimaryDark">@color/material_primary_700</item>
+        <item name="preferenceTheme">@style/Theme.Material.PreferenceThemeOverlay</item>
         <item name="windowNoTitle">true</item>
     </style>
 
+    <!-- Fix for wrong padding on v17-v20 based on: https://github.com/Gericop/Android-Support-Preference-V7-Fix/blob/a6082cb/preference-v7/src/main/res/values-v17/styles.xml -->
+    <style name="Theme.Material" parent="Theme.MaterialBase">
+        <item name="android:listPreferredItemPaddingStart">16dp</item>
+        <item name="android:listPreferredItemPaddingEnd">16dp</item>
+    </style>
+    <!-- This is needed because the default PreferenceCategory appearance doesn't use bold text style -->
+    <style name="Preference_TextAppearanceMaterialBody2">
+        <item name="android:textSize">14sp</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+    <style name="Theme.Material.PreferenceThemeOverlay" parent="@style/PreferenceThemeOverlay.v14.Material">
+        <item name="preferenceFragmentListStyle">@style/Theme.Material.PreferenceFragmentList</item>
+    </style>
+    <style name="Theme.Material.PreferenceFragmentList" parent="@style/PreferenceFragmentList.Material">
+        <item name="android:fadeScrollbars">true</item>
+        <item name="android:scrollbars">vertical</item>
+    </style>
+    <style name="NumberPickerStyle">
+        <item name="android:textSize">14sp</item>
+    </style>
+
 </resources>

src/main/res/xml/pref_all.xml

@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:app="http://schemas.android.com/apk/res/com.github.shadowsocks">
-
-    <PreferenceCategory
-            android:title="@string/proxy_cat">
-
-        <com.github.shadowsocks.preferences.SummaryEditTextPreference
-                android:key="profileName"
-                android:persistent="false"
-                android:title="@string/profile_name"/>
-        <com.github.shadowsocks.preferences.SummaryEditTextPreference
-                android:key="proxy"
-                android:persistent="false"
-                android:summary="@string/proxy_summary"
-                android:title="@string/proxy"/>
-        <com.github.shadowsocks.preferences.NumberPickerPreference
-                app:min="1"
-                app:max="65535"
-                android:key="remotePortNum"
-                android:persistent="false"
-                android:summary="@string/remote_port_summary"
-                android:title="@string/remote_port"/>
-        <com.github.shadowsocks.preferences.NumberPickerPreference
-                app:min="1025"
-                app:max="65535"
-                android:key="localPortNum"
-                android:persistent="false"
-                android:summary="@string/port_summary"
-                android:title="@string/port"/>
-        <com.github.shadowsocks.preferences.PasswordEditTextPreference
-                android:inputType="textPassword"
-                android:key="sitekey"
-                android:persistent="false"
-                android:summary="@string/sitekey_summary"
-                android:title="@string/sitekey"/>
-        <com.github.shadowsocks.preferences.DropDownPreference
-                android:key="encMethod"
-                android:persistent="false"
-                android:entries="@array/enc_method_entry"
-                android:entryValues="@array/enc_method_value"
-                android:summary="%s"
-                android:title="@string/enc_method"/>
-        <SwitchPreference
-                android:key="isAuth"
-                android:persistent="false"
-                android:summary="@string/onetime_auth_summary"
-                android:title="@string/onetime_auth"/>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-            android:title="@string/feature_cat">
-
-        <com.github.shadowsocks.preferences.DropDownPreference
-                android:key="route"
-                android:persistent="false"
-                android:entries="@array/route_entry"
-                android:entryValues="@array/route_value"
-                android:summary="%s"
-                android:title="@string/route_list"/>
-        <SwitchPreference
-                android:key="isIpv6"
-                android:persistent="false"
-                android:summary="@string/ipv6_summary"
-                android:title="@string/ipv6"/>
-        <SwitchPreference
-                android:key="isProxyApps"
-                android:persistent="false"
-                android:summary="@string/proxied_apps_summary"
-                android:title="@string/proxied_apps"/>
-        <SwitchPreference
-                android:key="isUdpDns"
-                android:persistent="false"
-                android:summary="@string/udp_dns_summary"
-                android:title="@string/udp_dns"/>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-            android:title="@string/kcp">
-
-        <SwitchPreference
-                android:key="kcp"
-                android:persistent="false"
-                android:summary="@string/kcp_summary"
-                android:title="@string/kcp"/>
-
-        <com.github.shadowsocks.preferences.NumberPickerPreference
-                app:min="1"
-                app:max="65535"
-                android:key="kcpPort"
-                android:persistent="false"
-                android:summary="@string/kcp_port_summary"
-                android:title="@string/kcp_port"/>
-
-        <com.github.shadowsocks.preferences.KcpCliPreference
-                android:key="kcpcli"
-                android:persistent="false"
-                android:summary="@string/kcpcli_summary"
-                android:title="@string/kcpcli"/>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/misc_cat">
-
-        <SwitchPreference
-                android:key="isAutoConnect"
-                android:persistent="false"
-                android:summary="@string/auto_connect_summary"
-                android:title="@string/auto_connect"/>
-
-        <SwitchPreference
-                android:key="tcp_fastopen"
-                android:persistent="false"
-                android:summary="@string/tcp_fastopen_summary"
-                android:title="TCP Fast Open"/>
-
-        <SwitchPreference android:key="isNAT"
-                          android:title="@string/nat"
-                          android:summary="@string/nat_summary"/>
-        <Preference android:key="recovery" android:title="@string/recovery"
-            android:summary="@string/recovery_summary"/>
-        <Preference android:key="flush_dnscache"
-                    android:title="@string/flush_dnscache"
-                    android:summary="@string/flush_dnscache_summary"/>
-        <Preference android:key="about" android:title="@string/about"/>
-
-    </PreferenceCategory>
-
-
-</PreferenceScreen>

src/main/res/xml/pref_global.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreference android:key="isAutoConnect"
+                      android:persistent="false"
+                      android:summary="@string/auto_connect_summary"
+                      android:title="@string/auto_connect"/>
+    <SwitchPreference android:key="tcp_fastopen"
+                      android:summary="@string/tcp_fastopen_summary"
+                      android:title="TCP Fast Open"/>
+    <SwitchPreference android:key="isNAT"
+                      android:title="@string/nat"
+                      android:summary="@string/nat_summary"/>
+</PreferenceScreen>

src/main/res/xml/pref_profile.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:app="http://schemas.android.com/apk/res/com.github.shadowsocks">
+
+    <be.mygod.preference.PreferenceCategory
+            android:title="@string/proxy_cat">
+
+        <be.mygod.preference.EditTextPreference
+                android:key="profileName"
+                android:summary="%s"
+                android:title="@string/profile_name"/>
+        <be.mygod.preference.EditTextPreference
+                android:key="proxy"
+                android:summary="%s"
+                android:title="@string/proxy"/>
+        <be.mygod.preference.NumberPickerPreference
+                app:min="1"
+                app:max="65535"
+                android:key="remotePortNum"
+                android:summary="%d"
+                android:title="@string/remote_port"/>
+        <be.mygod.preference.NumberPickerPreference
+                app:min="1025"
+                app:max="65535"
+                android:key="localPortNum"
+                android:summary="%d"
+                android:title="@string/port"/>
+        <be.mygod.preference.EditTextPreference
+                android:inputType="textPassword"
+                android:key="sitekey"
+                android:summary="%s"
+                android:title="@string/sitekey"/>
+        <DropDownPreference
+                android:key="encMethod"
+                android:entries="@array/enc_method_entry"
+                android:entryValues="@array/enc_method_value"
+                android:summary="%s"
+                android:title="@string/enc_method"/>
+        <SwitchPreference
+                android:key="isAuth"
+                android:summary="@string/onetime_auth_summary"
+                android:title="@string/onetime_auth"/>
+
+    </be.mygod.preference.PreferenceCategory>
+
+    <be.mygod.preference.PreferenceCategory
+            android:title="@string/feature_cat">
+
+        <DropDownPreference
+                android:key="route"
+                android:entries="@array/route_entry"
+                android:entryValues="@array/route_value"
+                android:summary="%s"
+                android:title="@string/route_list"/>
+        <be.mygod.preference.EditTextPreference
+                android:key="remoteDns"
+                android:title="@string/remote_dns"
+                android:summary="%s"/>
+        <SwitchPreference
+                android:key="isIpv6"
+                android:summary="@string/ipv6_summary"
+                android:title="@string/ipv6"/>
+        <SwitchPreference
+                android:key="isProxyApps"
+                android:summary="@string/proxied_apps_summary"
+                android:title="@string/proxied_apps"/>
+        <SwitchPreference
+                android:key="isUdpDns"
+                android:summary="@string/udp_dns_summary"
+                android:title="@string/udp_dns"/>
+
+    </be.mygod.preference.PreferenceCategory>
+
+    <be.mygod.preference.PreferenceCategory
+            android:title="@string/kcp">
+
+        <SwitchPreference
+                android:key="kcp"
+                android:summary="@string/kcp_summary"
+                android:title="@string/kcp"/>
+
+        <be.mygod.preference.NumberPickerPreference
+                app:min="1"
+                app:max="65535"
+                android:key="kcpPort"
+                android:summary="@string/kcp_port_summary"
+                android:title="@string/kcp_port"/>
+
+        <be.mygod.preference.EditTextPreference
+                android:key="kcpcli"
+                android:summary="%s"
+                android:title="@string/kcpcli"/>
+
+    </be.mygod.preference.PreferenceCategory>
+
+</PreferenceScreen>

src/main/res/xml/shortcuts.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut android:shortcutId="toggle"
+              android:icon="@drawable/ic_qu_shadowsocks_launcher"
+              android:shortcutShortLabel="@string/quick_toggle"
+              android:shortcutLongLabel="@string/quick_toggle">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.github.shadowsocks"
+                android:targetClass="com.github.shadowsocks.QuickToggleShortcut" />
+    </shortcut>
+    <shortcut android:shortcutId="scan"
+              android:icon="@drawable/ic_qu_camera_launcher"
+              android:shortcutShortLabel="@string/add_profile_methods_scan_qr_code"
+              android:shortcutLongLabel="@string/add_profile_methods_scan_qr_code">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.github.shadowsocks"
+                android:targetClass="com.github.shadowsocks.ScannerActivity" />
+    </shortcut>
+</shortcuts>

src/main/scala/be/mygod/preference/DialogPreferencePlus.scala

@@ -0,0 +1,28 @@
+/*******************************************************************************/
+/*                                                                             */
+/*  Copyright (C) 2016 by Max Lv <max.c.lv@gmail.com>                          */
+/*  Copyright (C) 2016 by Mygod Studio <contact-shadowsocks-android@mygod.be>  */
+/*                                                                             */
+/*  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 <http://www.gnu.org/licenses/>.       */
+/*                                                                             */
+/*******************************************************************************/
+
+package be.mygod.preference
+
+import android.app.DialogFragment
+import android.support.v7.preference.DialogPreference
+
+trait DialogPreferencePlus extends DialogPreference {
+  def createDialog(): DialogFragment
+}