diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..bef56379
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+github: [tibbi]
+patreon: tiborkaputa
+custom: ["https://www.paypal.me/SimpleMobileTools", "https://www.simplemobiletools.com/donate"]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f7e432f..68705eea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,44 @@
Changelog
==========
+Version 6.5.2 *(2020-01-04)*
+----------------------------
+
+ * Fixed some theming issues
+ * Added some UI and translation improvements
+
+Version 6.5.1 *(2019-12-07)*
+----------------------------
+
+ * Rewrote the Select Contact screen for handling contact picking for other apps
+ * Fixed a glitch with some contacts not being visible in some cases
+
+Version 6.5.0 *(2019-12-05)*
+----------------------------
+
+ * Added many UI changes to refresh the apps look
+ * Fixed some third party intents and added handling for some new ones
+ * Show dialpad letters by default
+ * If the Dialpad button is hidden at the bottom, show it in the top Menu
+
+Version 6.4.4 *(2019-10-28)*
+----------------------------
+
+ * Improving the performance at fetching local contacts
+
+Version 6.4.3 *(2019-10-28)*
+----------------------------
+
+ * Fixed some Organization type contacts not being visible
+ * Improve the performance at showing a specific Contact details
+ * Added some stability and translation improvements
+
+Version 6.4.2 *(2019-10-14)*
+----------------------------
+
+ * Close search at opening a contact
+ * Some smaller misc improvements
+
Version 6.4.1 *(2019-09-16)*
----------------------------
diff --git a/LICENSE b/LICENSE
index 261eeb9e..f288702d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,201 +1,674 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
- 1. Definitions.
+ Preamble
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
+ 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.
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
+ 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.
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
+ 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.
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
+ 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.
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
+ 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.
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
+ 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.
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
+ 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.
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
+ 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.
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
+ The precise terms and conditions for copying, distribution and
+modification follow.
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
+ TERMS AND CONDITIONS
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
+ 0. Definitions.
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
+ "This License" refers to version 3 of the GNU General Public License.
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
+ "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.
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
+ 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.
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
+ 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.
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
+ 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.
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
+ 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.
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
+ 1. Source Code.
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
+ 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.
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
+ 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.
- END OF TERMS AND CONDITIONS
+ 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.
- APPENDIX: How to apply the Apache License to your work.
+ 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.
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
- Copyright [yyyy] [name of copyright owner]
+ The Corresponding Source for a work in source code form is that
+same work.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 2. Basic Permissions.
- http://www.apache.org/licenses/LICENSE-2.0
+ 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.
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ 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.
+
+
+ Copyright (C)
+
+ 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 .
+
+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:
+
+ Copyright (C)
+ 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
+.
+
+ 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
+.
diff --git a/README.md b/README.md
index 2cd5f15b..b5575b39 100644
--- a/README.md
+++ b/README.md
@@ -13,23 +13,7 @@ This app is just one piece of a bigger series of apps. You can find the rest of
-
-License
--------
- Copyright 2017-present SimpleMobileTools
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/app/build.gradle b/app/build.gradle
index 7cfbd916..17c28582 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,9 @@ apply plugin: 'kotlin-kapt'
def keystorePropertiesFile = rootProject.file("keystore.properties")
def keystoreProperties = new Properties()
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+if (keystorePropertiesFile.exists()) {
+ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
android {
compileSdkVersion 28
@@ -15,17 +17,19 @@ android {
applicationId "com.simplemobiletools.contacts.pro"
minSdkVersion 21
targetSdkVersion 28
- versionCode 48
- versionName "6.4.1"
+ versionCode 55
+ versionName "6.5.2"
setProperty("archivesBaseName", "contacts")
}
signingConfigs {
- release {
- keyAlias keystoreProperties['keyAlias']
- keyPassword keystoreProperties['keyPassword']
- storeFile file(keystoreProperties['storeFile'])
- storePassword keystoreProperties['storePassword']
+ if (keystorePropertiesFile.exists()) {
+ release {
+ keyAlias keystoreProperties['keyAlias']
+ keyPassword keystoreProperties['keyPassword']
+ storeFile file(keystoreProperties['storeFile'])
+ storePassword keystoreProperties['storePassword']
+ }
}
}
@@ -36,7 +40,9 @@ android {
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- signingConfig signingConfigs.release
+ if (keystorePropertiesFile.exists()) {
+ signingConfig signingConfigs.release
+ }
}
}
@@ -51,12 +57,12 @@ android {
}
dependencies {
- implementation 'com.simplemobiletools:commons:5.17.17'
+ implementation 'com.simplemobiletools:commons:5.21.24'
implementation 'joda-time:joda-time:2.10.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5'
- kapt "androidx.room:room-compiler:2.1.0"
- implementation "androidx.room:room-runtime:2.1.0"
- annotationProcessor "androidx.room:room-compiler:2.1.0"
+ kapt "androidx.room:room-compiler:2.2.2"
+ implementation "androidx.room:room-runtime:2.2.2"
+ annotationProcessor "androidx.room:room-compiler:2.2.2"
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 440b683b..9964f4cf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -59,22 +59,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:label="@string/select_contact">
+
+
+
+
+
+
@@ -170,6 +162,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
) {
ensureBackgroundThread {
removeContactsFromGroup(contacts, group.id!!)
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt
index 84642b36..4c78b4a1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/InsertOrEditContactActivity.kt
@@ -1,24 +1,47 @@
package com.simplemobiletools.contacts.pro.activities
import android.app.Activity
+import android.app.SearchManager
+import android.content.Context
import android.content.Intent
+import android.graphics.drawable.ColorDrawable
import android.os.Bundle
import android.provider.ContactsContract
import android.view.Menu
+import android.view.MenuItem
+import androidx.appcompat.widget.SearchView
+import androidx.core.view.MenuItemCompat
+import androidx.viewpager.widget.ViewPager
import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.helpers.PERMISSION_GET_ACCOUNTS
import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS
+import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_CONTACTS
import com.simplemobiletools.contacts.pro.R
-import com.simplemobiletools.contacts.pro.adapters.ContactsAdapter
+import com.simplemobiletools.contacts.pro.adapters.ViewPagerAdapter
+import com.simplemobiletools.contacts.pro.dialogs.ChangeSortingDialog
+import com.simplemobiletools.contacts.pro.dialogs.FilterContactSourcesDialog
import com.simplemobiletools.contacts.pro.extensions.config
import com.simplemobiletools.contacts.pro.extensions.getContactPublicUri
+import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment
import com.simplemobiletools.contacts.pro.helpers.*
+import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener
import com.simplemobiletools.contacts.pro.models.Contact
import kotlinx.android.synthetic.main.activity_insert_edit_contact.*
+import kotlinx.android.synthetic.main.fragment_contacts.*
+import kotlinx.android.synthetic.main.fragment_favorites.*
-class InsertOrEditContactActivity : SimpleActivity() {
+class InsertOrEditContactActivity : SimpleActivity(), RefreshContactsListener {
private val START_INSERT_ACTIVITY = 1
private val START_EDIT_ACTIVITY = 2
+ private var isSearchOpen = false
+ private var searchMenuItem: MenuItem? = null
+
+ private val contactsFavoritesList = arrayListOf(
+ CONTACTS_TAB_MASK,
+ FAVORITES_TAB_MASK
+ )
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_insert_edit_contact)
@@ -27,61 +50,41 @@ class InsertOrEditContactActivity : SimpleActivity() {
return
}
- title = getString(R.string.select_contact)
- setupViews()
+ setupTabColors()
+ // we do not really care about the permission request result. Even if it was denied, load private contacts
handlePermission(PERMISSION_READ_CONTACTS) {
- // we do not really care about the permission request result. Even if it was denied, load private contacts
- ContactsHelper(this).getContacts {
- gotContacts(it)
+ if (it) {
+ handlePermission(PERMISSION_WRITE_CONTACTS) {
+ handlePermission(PERMISSION_GET_ACCOUNTS) {
+ initFragments()
+ }
+ }
+ } else {
+ initFragments()
}
}
}
+ override fun onStop() {
+ super.onStop()
+ searchMenuItem?.collapseActionView()
+ }
+
override fun onCreateOptionsMenu(menu: Menu): Boolean {
+ menuInflater.inflate(R.menu.menu_insert_or_edit, menu)
+ setupSearch(menu)
updateMenuItemColors(menu)
return super.onCreateOptionsMenu(menu)
}
- private fun setupViews() {
- updateTextColors(insert_edit_contact_holder)
- new_contact_tmb.setImageDrawable(resources.getColoredDrawableWithColor(R.drawable.ic_new_contact_vector, config.textColor))
- new_contact_holder.setOnClickListener {
- Intent().apply {
- action = Intent.ACTION_INSERT
- data = ContactsContract.Contacts.CONTENT_URI
- putExtra(KEY_PHONE, getPhoneNumberFromIntent(intent))
- if (resolveActivity(packageManager) != null) {
- startActivityForResult(this, START_INSERT_ACTIVITY)
- } else {
- toast(R.string.no_app_found)
- }
- }
- }
-
- existing_contact_label.setTextColor(getAdjustedPrimaryColor())
- }
-
- private fun gotContacts(contacts: ArrayList) {
- ContactsAdapter(this, contacts, null, LOCATION_INSERT_OR_EDIT, null, existing_contact_list, existing_contact_fastscroller) {
- val contact = it as Contact
- Intent(applicationContext, EditContactActivity::class.java).apply {
- data = getContactPublicUri(contact)
- action = ADD_NEW_CONTACT_NUMBER
- putExtra(KEY_PHONE, getPhoneNumberFromIntent(intent))
- putExtra(IS_PRIVATE, contact.isPrivate())
- startActivityForResult(this, START_EDIT_ACTIVITY)
- }
- }.apply {
- addVerticalDividers(true)
- existing_contact_list.adapter = this
- }
-
- existing_contact_fastscroller.setScrollToY(0)
- existing_contact_fastscroller.setViews(existing_contact_list) {
- val item = (existing_contact_list.adapter as ContactsAdapter).contactItems.getOrNull(it)
- existing_contact_fastscroller.updateBubbleText(item?.getBubbleText() ?: "")
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ when (item.itemId) {
+ R.id.sort -> showSortingDialog()
+ R.id.filter -> showFilterDialog()
+ else -> return super.onOptionsItemSelected(item)
}
+ return true
}
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
@@ -90,4 +93,214 @@ class InsertOrEditContactActivity : SimpleActivity() {
finish()
}
}
+
+ private fun initFragments() {
+ viewpager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
+ override fun onPageScrollStateChanged(state: Int) {
+ if (isSearchOpen) {
+ getCurrentFragment()?.onSearchQueryChanged("")
+ searchMenuItem?.collapseActionView()
+ }
+ }
+
+ override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
+
+ override fun onPageSelected(position: Int) {
+ insert_or_edit_tabs_holder.getTabAt(position)?.select()
+ invalidateOptionsMenu()
+ }
+ })
+
+ viewpager.onGlobalLayout {
+ refreshContacts(getTabsMask())
+ }
+
+ insert_or_edit_tabs_holder.onTabSelectionChanged(
+ tabUnselectedAction = {
+ it.icon?.applyColorFilter(config.textColor)
+ },
+ tabSelectedAction = {
+ if (isSearchOpen) {
+ getCurrentFragment()?.onSearchQueryChanged("")
+ searchMenuItem?.collapseActionView()
+ }
+ viewpager.currentItem = it.position
+ it.icon?.applyColorFilter(getAdjustedPrimaryColor())
+ }
+ )
+
+ insert_or_edit_tabs_holder.removeAllTabs()
+ var skippedTabs = 0
+ contactsFavoritesList.forEachIndexed { index, value ->
+ if (config.showTabs and value == 0 && value == FAVORITES_TAB_MASK) {
+ skippedTabs++
+ } else {
+ val tab = insert_or_edit_tabs_holder.newTab().setIcon(getTabIcon(index))
+ insert_or_edit_tabs_holder.addTab(tab, index - skippedTabs, index == 0)
+ }
+ }
+
+ insert_or_edit_tabs_holder.beVisibleIf(skippedTabs == 0)
+
+ select_contact_label?.setTextColor(getAdjustedPrimaryColor())
+ new_contact_tmb?.setImageDrawable(resources.getColoredDrawableWithColor(R.drawable.ic_new_contact_vector, config.textColor))
+ new_contact_holder?.setOnClickListener {
+ createNewContact()
+ }
+ }
+
+ private fun setupSearch(menu: Menu) {
+ val searchManager = getSystemService(Context.SEARCH_SERVICE) as SearchManager
+ searchMenuItem = menu.findItem(R.id.search)
+ (searchMenuItem!!.actionView as SearchView).apply {
+ setSearchableInfo(searchManager.getSearchableInfo(componentName))
+ isSubmitButtonEnabled = false
+ queryHint = getString(getSearchString())
+ setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+ override fun onQueryTextSubmit(query: String) = false
+
+ override fun onQueryTextChange(newText: String): Boolean {
+ if (isSearchOpen) {
+ getCurrentFragment()?.onSearchQueryChanged(newText)
+ }
+ return true
+ }
+ })
+ }
+
+ MenuItemCompat.setOnActionExpandListener(searchMenuItem, object : MenuItemCompat.OnActionExpandListener {
+ override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
+ getCurrentFragment()?.onSearchOpened()
+ isSearchOpen = true
+ return true
+ }
+
+ override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
+ getCurrentFragment()?.onSearchClosed()
+ isSearchOpen = false
+ return true
+ }
+ })
+ }
+
+ private fun getSearchString(): Int {
+ return when (getCurrentFragment()) {
+ favorites_fragment -> R.string.search_favorites
+ else -> R.string.search_contacts
+ }
+ }
+
+ private fun getCurrentFragment(): MyViewPagerFragment? {
+ return if (viewpager.currentItem == 0) {
+ contacts_fragment
+ } else {
+ favorites_fragment
+ }
+ }
+
+ private fun setupTabColors() {
+ insert_or_edit_tabs_holder.apply {
+ background = ColorDrawable(config.backgroundColor)
+ setSelectedTabIndicatorColor(getAdjustedPrimaryColor())
+ }
+ }
+
+ override fun refreshContacts(refreshTabsMask: Int) {
+ if (isDestroyed || isFinishing) {
+ return
+ }
+
+ if (viewpager.adapter == null) {
+ viewpager.adapter = ViewPagerAdapter(this, contactsFavoritesList, getTabsMask())
+ }
+
+ ContactsHelper(this).getContacts { contacts ->
+ if (isDestroyed || isFinishing) {
+ return@getContacts
+ }
+
+ if (refreshTabsMask and CONTACTS_TAB_MASK != 0) {
+ contacts_fragment?.refreshContacts(contacts)
+ }
+
+ if (refreshTabsMask and FAVORITES_TAB_MASK != 0) {
+ favorites_fragment?.refreshContacts(contacts)
+ }
+ }
+ }
+
+ override fun contactClicked(contact: Contact) {
+ val phoneNumber = getPhoneNumberFromIntent(intent) ?: ""
+ val email = getEmailFromIntent(intent) ?: ""
+
+ Intent(applicationContext, EditContactActivity::class.java).apply {
+ data = getContactPublicUri(contact)
+ action = ADD_NEW_CONTACT_NUMBER
+
+ if (phoneNumber.isNotEmpty()) {
+ putExtra(KEY_PHONE, phoneNumber)
+ }
+
+ if (email.isNotEmpty()) {
+ putExtra(KEY_EMAIL, email)
+ }
+
+ putExtra(IS_PRIVATE, contact.isPrivate())
+ startActivityForResult(this, START_EDIT_ACTIVITY)
+ }
+ }
+
+ private fun createNewContact() {
+ val name = intent.getStringExtra(KEY_NAME) ?: ""
+ val phoneNumber = getPhoneNumberFromIntent(intent) ?: ""
+ val email = getEmailFromIntent(intent) ?: ""
+
+ Intent().apply {
+ action = Intent.ACTION_INSERT
+ data = ContactsContract.Contacts.CONTENT_URI
+
+ if (phoneNumber.isNotEmpty()) {
+ putExtra(KEY_PHONE, phoneNumber)
+ }
+
+ if (name.isNotEmpty()) {
+ putExtra(KEY_NAME, name)
+ }
+
+ if (email.isNotEmpty()) {
+ putExtra(KEY_EMAIL, email)
+ }
+
+ if (resolveActivity(packageManager) != null) {
+ startActivityForResult(this, START_INSERT_ACTIVITY)
+ } else {
+ toast(R.string.no_app_found)
+ }
+ }
+ }
+
+ fun fabClicked() {
+ createNewContact()
+ }
+
+ private fun showSortingDialog() {
+ ChangeSortingDialog(this) {
+ refreshContacts(getTabsMask())
+ }
+ }
+
+ fun showFilterDialog() {
+ FilterContactSourcesDialog(this) {
+ contacts_fragment?.forceListRedraw = true
+ refreshContacts(getTabsMask())
+ }
+ }
+
+ fun getTabsMask(): Int {
+ var mask = CONTACTS_TAB_MASK
+ if (config.showTabs and FAVORITES_TAB_MASK != 0) {
+ mask += FAVORITES_TAB_MASK
+ }
+ return mask
+ }
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt
index 49abd800..b052eed5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt
@@ -8,7 +8,6 @@ import android.content.pm.ShortcutInfo
import android.content.pm.ShortcutManager
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.Drawable
import android.graphics.drawable.Icon
import android.graphics.drawable.LayerDrawable
import android.net.Uri
@@ -34,9 +33,11 @@ import com.simplemobiletools.contacts.pro.dialogs.FilterContactSourcesDialog
import com.simplemobiletools.contacts.pro.dialogs.ImportContactsDialog
import com.simplemobiletools.contacts.pro.extensions.config
import com.simplemobiletools.contacts.pro.extensions.getTempFile
+import com.simplemobiletools.contacts.pro.extensions.handleGenericContactClick
import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment
import com.simplemobiletools.contacts.pro.helpers.*
import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener
+import com.simplemobiletools.contacts.pro.models.Contact
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.fragment_contacts.*
import kotlinx.android.synthetic.main.fragment_favorites.*
@@ -165,6 +166,11 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
storeStateVariables()
}
+ override fun onStop() {
+ super.onStop()
+ searchMenuItem?.collapseActionView()
+ }
+
override fun onDestroy() {
super.onDestroy()
config.lastUsedViewPagerPage = viewpager.currentItem
@@ -180,6 +186,8 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
menu.apply {
findItem(R.id.sort).isVisible = currentFragment != groups_fragment
findItem(R.id.filter).isVisible = currentFragment != groups_fragment
+ findItem(R.id.dialpad).isVisible = !config.showDialpadButton
+
setupSearch(this)
updateMenuItemColors(this)
}
@@ -191,6 +199,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
when (item.itemId) {
R.id.sort -> showSortingDialog()
R.id.filter -> showFilterDialog()
+ R.id.dialpad -> launchDialpad()
R.id.import_contacts -> tryImportContacts()
R.id.export_contacts -> tryExportContacts()
R.id.settings -> startActivity(Intent(applicationContext, SettingsActivity::class.java))
@@ -379,7 +388,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
)
if (intent?.action == Intent.ACTION_VIEW && intent.data != null) {
- tryImportContactsFromFile(intent.data)
+ tryImportContactsFromFile(intent.data!!)
intent.data = null
}
@@ -389,7 +398,8 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
if (config.showTabs and value == 0) {
skippedTabs++
} else {
- main_tabs_holder.addTab(main_tabs_holder.newTab().setIcon(getTabIcon(index)), index - skippedTabs, config.lastUsedViewPagerPage == index - skippedTabs)
+ val tab = main_tabs_holder.newTab().setIcon(getTabIcon(index))
+ main_tabs_holder.addTab(tab, index - skippedTabs, config.lastUsedViewPagerPage == index - skippedTabs)
}
}
@@ -404,21 +414,10 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
main_tabs_holder.beVisibleIf(skippedTabs < tabsList.size - 1)
main_dialpad_button.setOnClickListener {
- val intent = Intent(applicationContext, DialpadActivity::class.java)
- startActivity(intent)
+ launchDialpad()
}
}
- private fun getTabIcon(position: Int): Drawable {
- val drawableId = when (position) {
- LOCATION_CONTACTS_TAB -> R.drawable.ic_person_vector
- LOCATION_FAVORITES_TAB -> R.drawable.ic_star_on_vector
- else -> R.drawable.ic_group_vector
- }
-
- return resources.getColoredDrawableWithColor(drawableId, config.textColor)
- }
-
private fun showSortingDialog() {
ChangeSortingDialog(this) {
refreshContacts(CONTACTS_TAB_MASK or FAVORITES_TAB_MASK)
@@ -432,6 +431,11 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
}
}
+ private fun launchDialpad() {
+ val intent = Intent(applicationContext, DialpadActivity::class.java)
+ startActivity(intent)
+ }
+
private fun tryImportContacts() {
handlePermission(PERMISSION_READ_STORAGE) {
if (it) {
@@ -458,7 +462,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
private fun tryImportContactsFromFile(uri: Uri) {
when {
- uri.scheme == "file" -> showImportContactsDialog(uri.path)
+ uri.scheme == "file" -> showImportContactsDialog(uri.path!!)
uri.scheme == "content" -> {
val tempFile = getTempFile()
if (tempFile == null) {
@@ -469,7 +473,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
try {
val inputStream = contentResolver.openInputStream(uri)
val out = FileOutputStream(tempFile)
- inputStream.copyTo(out)
+ inputStream!!.copyTo(out)
showImportContactsDialog(tempFile.absolutePath)
} catch (e: Exception) {
showErrorToast(e)
@@ -528,7 +532,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
isGettingContacts = true
if (viewpager.adapter == null) {
- viewpager.adapter = ViewPagerAdapter(this)
+ viewpager.adapter = ViewPagerAdapter(this, tabsList, config.showTabs)
viewpager.currentItem = config.lastUsedViewPagerPage
}
@@ -555,6 +559,10 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
}
}
+ override fun contactClicked(contact: Contact) {
+ handleGenericContactClick(contact)
+ }
+
private fun getAllFragments() = arrayListOf(contacts_fragment, favorites_fragment, groups_fragment)
private fun checkWhatsNewDialog() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ManageSpeedDialActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ManageSpeedDialActivity.kt
new file mode 100644
index 00000000..4f12804e
--- /dev/null
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ManageSpeedDialActivity.kt
@@ -0,0 +1,20 @@
+package com.simplemobiletools.contacts.pro.activities
+
+import android.os.Bundle
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.simplemobiletools.contacts.pro.R
+import com.simplemobiletools.contacts.pro.extensions.config
+import com.simplemobiletools.contacts.pro.models.SpeedDial
+
+class ManageSpeedDialActivity : SimpleActivity() {
+ var speedDialValues = ArrayList()
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_manage_speed_dial)
+
+ val speedDialType = object : TypeToken>() {}.type
+ speedDialValues = Gson().fromJson>(config.speedDial, speedDialType) ?: ArrayList(1)
+ }
+}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SelectContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SelectContactActivity.kt
index 5199c704..69db856b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SelectContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SelectContactActivity.kt
@@ -1,11 +1,15 @@
package com.simplemobiletools.contacts.pro.activities
+import android.app.SearchManager
+import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.provider.ContactsContract
import android.view.Menu
import android.view.MenuItem
+import androidx.appcompat.widget.SearchView
+import androidx.core.view.MenuItemCompat
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS
import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_CONTACTS
@@ -17,11 +21,15 @@ import com.simplemobiletools.contacts.pro.extensions.config
import com.simplemobiletools.contacts.pro.extensions.getContactPublicUri
import com.simplemobiletools.contacts.pro.extensions.getVisibleContactSources
import com.simplemobiletools.contacts.pro.helpers.ContactsHelper
+import com.simplemobiletools.contacts.pro.helpers.getProperText
import com.simplemobiletools.contacts.pro.models.Contact
import kotlinx.android.synthetic.main.activity_select_contact.*
class SelectContactActivity : SimpleActivity() {
private var specialMimeType: String? = null
+ private var isSearchOpen = false
+ private var searchMenuItem: MenuItem? = null
+ private var contactsIgnoringSearch = ArrayList()
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -55,8 +63,14 @@ class SelectContactActivity : SimpleActivity() {
}
}
+ override fun onStop() {
+ super.onStop()
+ searchMenuItem?.collapseActionView()
+ }
+
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu_select_activity, menu)
+ setupSearch(menu)
updateMenuItemColors(menu)
return true
}
@@ -70,6 +84,79 @@ class SelectContactActivity : SimpleActivity() {
return true
}
+ private fun setupSearch(menu: Menu) {
+ val searchManager = getSystemService(Context.SEARCH_SERVICE) as SearchManager
+ searchMenuItem = menu.findItem(R.id.search)
+ (searchMenuItem!!.actionView as SearchView).apply {
+ setSearchableInfo(searchManager.getSearchableInfo(componentName))
+ isSubmitButtonEnabled = false
+ queryHint = getString(R.string.search_contacts)
+ setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+ override fun onQueryTextSubmit(query: String) = false
+
+ override fun onQueryTextChange(newText: String): Boolean {
+ if (isSearchOpen) {
+ onSearchQueryChanged(newText)
+ }
+ return true
+ }
+ })
+ }
+
+ MenuItemCompat.setOnActionExpandListener(searchMenuItem, object : MenuItemCompat.OnActionExpandListener {
+ override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
+ onSearchOpened()
+ isSearchOpen = true
+ return true
+ }
+
+ override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
+ onSearchClosed()
+ isSearchOpen = false
+ return true
+ }
+ })
+ }
+
+ private fun onSearchQueryChanged(text: String) {
+ val adapter = select_contact_list.adapter
+ if (adapter != null && adapter is SelectContactsAdapter) {
+ val shouldNormalize = text.normalizeString() == text
+ val filtered = contactsIgnoringSearch.filter {
+ getProperText(it.getNameToDisplay(), shouldNormalize).contains(text, true) ||
+ getProperText(it.nickname, shouldNormalize).contains(text, true) ||
+ it.doesContainPhoneNumber(text, false) ||
+ it.emails.any { it.value.contains(text, true) } ||
+ it.addresses.any { getProperText(it.value, shouldNormalize).contains(text, true) } ||
+ it.IMs.any { it.value.contains(text, true) } ||
+ getProperText(it.notes, shouldNormalize).contains(text, true) ||
+ getProperText(it.organization.company, shouldNormalize).contains(text, true) ||
+ getProperText(it.organization.jobPosition, shouldNormalize).contains(text, true) ||
+ it.websites.any { it.contains(text, true) }
+ } as ArrayList
+
+ filtered.sortBy {
+ val nameToDisplay = it.getNameToDisplay()
+ !getProperText(nameToDisplay, shouldNormalize).startsWith(text, true) && !nameToDisplay.contains(text, true)
+ }
+
+ if (filtered.isEmpty()) {
+ select_contact_placeholder.text = getString(R.string.no_items_found)
+ }
+
+ select_contact_placeholder.beVisibleIf(filtered.isEmpty())
+ adapter.updateItems(filtered, text.normalizeString())
+ }
+ }
+
+ private fun onSearchOpened() {
+ contactsIgnoringSearch = (select_contact_list.adapter as? SelectContactsAdapter)?.contacts ?: ArrayList()
+ }
+
+ private fun onSearchClosed() {
+ (select_contact_list.adapter as? SelectContactsAdapter)?.updateItems(contactsIgnoringSearch)
+ }
+
private fun showSortingDialog() {
ChangeSortingDialog(this) {
initContacts()
@@ -106,7 +193,7 @@ class SelectContactActivity : SimpleActivity() {
runOnUiThread {
updatePlaceholderVisibility(contacts)
- SelectContactsAdapter(this, contacts, ArrayList(), false, select_contact_list) {
+ SelectContactsAdapter(this, contacts, ArrayList(), false, select_contact_list, select_contact_fastscroller) {
confirmSelection(it)
}.apply {
select_contact_list.adapter = this
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt
index 43e87563..7280a79c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt
@@ -33,6 +33,7 @@ class SettingsActivity : SimpleActivity() {
setupManageShownContactFields()
setupManageShownTabs()
setupManageBlockedNumbers()
+ setupManageSpeedDial()
setupUseEnglish()
setupShowInfoBubble()
setupShowContactThumbnails()
@@ -79,6 +80,12 @@ class SettingsActivity : SimpleActivity() {
}
}
+ private fun setupManageSpeedDial() {
+ settings_manage_speed_dial_holder.setOnClickListener {
+ startActivity(Intent(this, ManageSpeedDialActivity::class.java))
+ }
+ }
+
private fun setupUseEnglish() {
settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale.getDefault().language != "en")
settings_use_english.isChecked = config.useEnglish
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt
index 0ff042c7..4b3538c4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt
@@ -3,13 +3,16 @@ package com.simplemobiletools.contacts.pro.activities
import android.annotation.TargetApi
import android.content.ContentValues
import android.content.Intent
+import android.graphics.drawable.Drawable
+import android.net.Uri
import android.os.Build
import android.telecom.TelecomManager
import com.simplemobiletools.commons.activities.BaseSimpleActivity
+import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.contacts.pro.R
-import com.simplemobiletools.contacts.pro.helpers.KEY_PHONE
-import com.simplemobiletools.contacts.pro.helpers.REQUEST_CODE_SET_DEFAULT_DIALER
+import com.simplemobiletools.contacts.pro.extensions.config
+import com.simplemobiletools.contacts.pro.helpers.*
open class SimpleActivity : BaseSimpleActivity() {
override fun getAppIconIDs() = arrayListOf(
@@ -53,6 +56,14 @@ open class SimpleActivity : BaseSimpleActivity() {
return null
}
+ protected fun getEmailFromIntent(intent: Intent): String? {
+ return if (intent.dataString?.startsWith("$KEY_MAILTO:") == true) {
+ Uri.decode(intent.dataString!!.substringAfter("$KEY_MAILTO:").trim())
+ } else {
+ null
+ }
+ }
+
@TargetApi(Build.VERSION_CODES.M)
protected fun launchSetDefaultDialerIntent() {
Intent(TelecomManager.ACTION_CHANGE_DEFAULT_DIALER).putExtra(TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME, packageName).apply {
@@ -63,4 +74,14 @@ open class SimpleActivity : BaseSimpleActivity() {
}
}
}
+
+ protected fun getTabIcon(position: Int): Drawable {
+ val drawableId = when (position) {
+ LOCATION_CONTACTS_TAB -> R.drawable.ic_person_vector
+ LOCATION_FAVORITES_TAB -> R.drawable.ic_star_on_vector
+ else -> R.drawable.ic_group_vector
+ }
+
+ return resources.getColoredDrawableWithColor(drawableId, config.textColor)
+ }
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
index 9c437aef..7efcd46d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
@@ -100,7 +100,7 @@ class ViewContactActivity : ContactActivity() {
if (contactId == 0 && isViewIntent) {
val data = intent.data
if (data != null) {
- val rawId = if (data.path.contains("lookup")) {
+ val rawId = if (data.path!!.contains("lookup")) {
val lookupKey = getLookupKeyFromUri(data)
if (lookupKey != null) {
contact = ContactsHelper(this).getContactWithLookupKey(lookupKey)
@@ -205,22 +205,33 @@ class ViewContactActivity : ContactActivity() {
ContactsHelper(this).getContactSources {
contactSources = it
- getDuplicateContacts {
- setupPhoneNumbers()
- setupEmails()
- setupAddresses()
- setupIMs()
- setupEvents()
- setupWebsites()
- setupGroups()
- setupContactSources()
- setupNotes()
- setupOrganization()
- updateTextColors(contact_scrollview)
+ runOnUiThread {
+ setupContactDetails()
+ getDuplicateContacts {
+ setupContactDetails()
+ }
}
}
}
+ private fun setupContactDetails() {
+ if (isFinishing || isDestroyed || contact == null) {
+ return
+ }
+
+ setupPhoneNumbers()
+ setupEmails()
+ setupAddresses()
+ setupIMs()
+ setupEvents()
+ setupWebsites()
+ setupGroups()
+ setupContactSources()
+ setupNotes()
+ setupOrganization()
+ updateTextColors(contact_scrollview)
+ }
+
private fun launchEditContact(contact: Contact) {
wasEditLaunched = true
editContact(contact)
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
index 13cc99dd..77e028a2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
@@ -1,10 +1,6 @@
package com.simplemobiletools.contacts.pro.adapters
import android.graphics.drawable.Drawable
-import android.telephony.PhoneNumberUtils
-import android.text.Spannable
-import android.text.SpannableString
-import android.text.style.ForegroundColorSpan
import android.view.Menu
import android.view.View
import android.view.ViewGroup
@@ -109,6 +105,10 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList, val
override fun getItemKeyPosition(key: Int) = groups.indexOfFirst { it.id!!.toInt() == key }
+ override fun onActionModeCreated() {}
+
+ override fun onActionModeDestroyed() {}
+
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.item_group, parent)
override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ManageBlockedNumbersAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ManageBlockedNumbersAdapter.kt
index 5dee5305..cdf55829 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ManageBlockedNumbersAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ManageBlockedNumbersAdapter.kt
@@ -41,6 +41,10 @@ class ManageBlockedNumbersAdapter(activity: BaseSimpleActivity, var blockedNumbe
override fun getItemKeyPosition(key: Int) = blockedNumbers.indexOfFirst { it.id.toInt() == key }
+ override fun onActionModeCreated() {}
+
+ override fun onActionModeDestroyed() {}
+
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.item_manage_blocked_number, parent)
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt
index 05b20fe0..f6ddffc0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt
@@ -4,7 +4,6 @@ import android.graphics.drawable.Drawable
import android.util.SparseArray
import android.view.View
import android.view.ViewGroup
-import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.bumptech.glide.load.engine.DiskCacheStrategy
@@ -14,24 +13,31 @@ import com.bumptech.glide.signature.ObjectKey
import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
+import com.simplemobiletools.commons.extensions.highlightTextPart
+import com.simplemobiletools.commons.views.FastScroller
import com.simplemobiletools.commons.views.MyRecyclerView
import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.activities.SimpleActivity
import com.simplemobiletools.contacts.pro.extensions.config
import com.simplemobiletools.contacts.pro.helpers.Config
+import com.simplemobiletools.contacts.pro.helpers.highlightTextFromNumbers
import com.simplemobiletools.contacts.pro.models.Contact
import kotlinx.android.synthetic.main.item_add_favorite_with_number.view.*
import java.util.*
-class SelectContactsAdapter(val activity: SimpleActivity, val contacts: List, private val selectedContacts: ArrayList, private val allowPickMultiple: Boolean,
- private val recyclerView: MyRecyclerView, private val itemClick: ((Contact) -> Unit)? = null) : RecyclerView.Adapter() {
+class SelectContactsAdapter(val activity: SimpleActivity, var contacts: ArrayList, private val selectedContacts: ArrayList, private val allowPickMultiple: Boolean,
+ recyclerView: MyRecyclerView, val fastScroller: FastScroller, private val itemClick: ((Contact) -> Unit)? = null) :
+ RecyclerView.Adapter() {
private val itemViews = SparseArray()
private val selectedPositions = HashSet()
private val config = activity.config
private val textColor = config.textColor
+ private val adjustedPrimaryColor = activity.getAdjustedPrimaryColor()
+
private val contactDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_person_vector, textColor)
private val showContactThumbnails = config.showContactThumbnails
private val itemLayout = if (config.showPhoneNumbers) R.layout.item_add_favorite_with_number else R.layout.item_add_favorite_without_number
+ private var textToHighlight = ""
private var smallPadding = activity.resources.getDimension(R.dimen.small_margin).toInt()
private var bigPadding = activity.resources.getDimension(R.dimen.normal_margin).toInt()
@@ -46,11 +52,6 @@ class SelectContactsAdapter(val activity: SimpleActivity, val contacts: List 0) {
recyclerView.removeItemDecorationAt(0)
}
-
- DividerItemDecoration(activity, DividerItemDecoration.VERTICAL).apply {
- setDrawable(activity.resources.getDrawable(R.drawable.divider))
- recyclerView.addItemDecoration(this)
- }
}
private fun toggleItemSelection(select: Boolean, pos: Int) {
@@ -84,6 +85,25 @@ class SelectContactsAdapter(val activity: SimpleActivity, val contacts: List, highlightText: String = "") {
+ if (newItems.hashCode() != contacts.hashCode()) {
+ contacts = newItems.clone() as ArrayList
+ textToHighlight = highlightText
+ notifyDataSetChanged()
+ } else if (textToHighlight != highlightText) {
+ textToHighlight = highlightText
+ notifyDataSetChanged()
+ }
+ fastScroller.measureRecyclerView()
+ }
+
+ override fun onViewRecycled(holder: ViewHolder) {
+ super.onViewRecycled(holder)
+ if (!activity.isDestroyed && !activity.isFinishing) {
+ Glide.with(activity).clear(holder.itemView.contact_tmb)
+ }
+ }
+
inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
fun bindView(contact: Contact, contactDrawable: Drawable, config: Config, showContactThumbnails: Boolean,
smallPadding: Int, bigPadding: Int): View {
@@ -92,13 +112,30 @@ class SelectContactsAdapter(val activity: SimpleActivity, val contacts: List, val showTabs: Int) : PagerAdapter() {
override fun instantiateItem(container: ViewGroup, position: Int): Any {
val layout = getFragment(position)
@@ -31,7 +28,7 @@ class ViewPagerAdapter(val activity: MainActivity) : PagerAdapter() {
container.removeView(item as View)
}
- override fun getCount() = tabsList.filter { it and showTabs != 0 }.size
+ override fun getCount() = currTabsList.filter { it and showTabs != 0 }.size
override fun isViewFromObject(view: View, item: Any) = view == item
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt
index 5e93f5a0..3f8fc29d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/SelectContactsDialog.kt
@@ -29,7 +29,7 @@ class SelectContactsDialog(val activity: SimpleActivity, initialContacts: ArrayL
activity.runOnUiThread {
view.apply {
- select_contact_list.adapter = SelectContactsAdapter(activity, allContacts, initiallySelectedContacts, true, select_contact_list)
+ select_contact_list.adapter = SelectContactsAdapter(activity, allContacts, initiallySelectedContacts, true, select_contact_list, select_contact_fastscroller)
select_contact_fastscroller.allowBubbleDisplay = activity.baseConfig.showInfoBubble
select_contact_fastscroller.setViews(select_contact_list) {
select_contact_fastscroller.updateBubbleText(allContacts[it].getBubbleText())
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt
index c576b080..9995e35c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Activity.kt
@@ -101,7 +101,7 @@ fun BaseSimpleActivity.shareContacts(contacts: ArrayList) {
}
}
-fun SimpleActivity.contactClicked(contact: Contact) {
+fun SimpleActivity.handleGenericContactClick(contact: Contact) {
when (config.onContactClick) {
ON_CLICK_CALL_CONTACT -> callContact(contact)
ON_CLICK_VIEW_CONTACT -> viewContact(contact)
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt
index 2aafcf93..c7072406 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt
@@ -66,7 +66,7 @@ fun Context.editContact(contact: Contact) {
fun Context.sendEmailIntent(recipient: String) {
Intent(Intent.ACTION_SENDTO).apply {
- data = Uri.fromParts("mailto", recipient, null)
+ data = Uri.fromParts(KEY_MAILTO, recipient, null)
if (resolveActivity(packageManager) != null) {
startActivity(this)
} else {
@@ -126,7 +126,7 @@ fun Context.getContactUriRawId(uri: Uri): Int {
var cursor: Cursor? = null
try {
cursor = contentResolver.query(uri, projection, null, null, null)
- if (cursor.moveToFirst()) {
+ if (cursor!!.moveToFirst()) {
return cursor.getIntValue(ContactsContract.Contacts.NAME_RAW_CONTACT_ID)
}
} catch (ignored: Exception) {
@@ -380,7 +380,7 @@ fun Context.deleteBlockedNumber(number: String) {
val values = ContentValues()
values.put(BlockedNumbers.COLUMN_ORIGINAL_NUMBER, number)
val uri = contentResolver.insert(BlockedNumbers.CONTENT_URI, values)
- contentResolver.delete(uri, null, null)
+ contentResolver.delete(uri!!, null, null)
}
@TargetApi(Build.VERSION_CODES.M)
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/ContactsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/ContactsFragment.kt
index dd0009d5..73816813 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/ContactsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/ContactsFragment.kt
@@ -4,6 +4,8 @@ import android.content.Context
import android.content.Intent
import android.util.AttributeSet
import com.simplemobiletools.contacts.pro.activities.EditContactActivity
+import com.simplemobiletools.contacts.pro.activities.InsertOrEditContactActivity
+import com.simplemobiletools.contacts.pro.activities.MainActivity
class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) {
override fun fabClicked() {
@@ -13,6 +15,10 @@ class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPag
}
override fun placeholderClicked() {
- activity!!.showFilterDialog()
+ if (activity is MainActivity) {
+ (activity as MainActivity).showFilterDialog()
+ } else if (activity is InsertOrEditContactActivity) {
+ (activity as InsertOrEditContactActivity).showFilterDialog()
+ }
}
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/FavoritesFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/FavoritesFragment.kt
index eb18ae40..66be621f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/FavoritesFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/FavoritesFragment.kt
@@ -2,6 +2,7 @@ package com.simplemobiletools.contacts.pro.fragments
import android.content.Context
import android.util.AttributeSet
+import com.simplemobiletools.contacts.pro.activities.MainActivity
import com.simplemobiletools.contacts.pro.activities.SimpleActivity
import com.simplemobiletools.contacts.pro.dialogs.SelectContactsDialog
import com.simplemobiletools.contacts.pro.helpers.ContactsHelper
@@ -24,7 +25,7 @@ class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPa
removeFavorites(removedContacts)
}
- activity!!.refreshContacts(FAVORITES_TAB_MASK)
+ (activity as? MainActivity)?.refreshContacts(FAVORITES_TAB_MASK)
}
}
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/GroupsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/GroupsFragment.kt
index 87178c5f..22ba261a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/GroupsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/GroupsFragment.kt
@@ -2,6 +2,7 @@ package com.simplemobiletools.contacts.pro.fragments
import android.content.Context
import android.util.AttributeSet
+import com.simplemobiletools.contacts.pro.activities.MainActivity
import com.simplemobiletools.contacts.pro.activities.SimpleActivity
import com.simplemobiletools.contacts.pro.dialogs.CreateNewGroupDialog
import com.simplemobiletools.contacts.pro.helpers.GROUPS_TAB_MASK
@@ -18,7 +19,7 @@ class GroupsFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
private fun showNewGroupsDialog() {
CreateNewGroupDialog(activity as SimpleActivity) {
- activity!!.refreshContacts(GROUPS_TAB_MASK)
+ (activity as? MainActivity)?.refreshContacts(GROUPS_TAB_MASK)
}
}
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/InsertOrEditContactsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/InsertOrEditContactsFragment.kt
new file mode 100644
index 00000000..99d5f28f
--- /dev/null
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/InsertOrEditContactsFragment.kt
@@ -0,0 +1,10 @@
+package com.simplemobiletools.contacts.pro.fragments
+
+import android.content.Context
+import android.util.AttributeSet
+
+class InsertOrEditContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) {
+ override fun fabClicked() {}
+
+ override fun placeholderClicked() {}
+}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
index d5a30aef..85395447 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
@@ -11,20 +11,21 @@ import com.simplemobiletools.commons.helpers.SORT_BY_FIRST_NAME
import com.simplemobiletools.commons.helpers.SORT_BY_SURNAME
import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.activities.GroupContactsActivity
+import com.simplemobiletools.contacts.pro.activities.InsertOrEditContactActivity
import com.simplemobiletools.contacts.pro.activities.MainActivity
import com.simplemobiletools.contacts.pro.activities.SimpleActivity
import com.simplemobiletools.contacts.pro.adapters.ContactsAdapter
import com.simplemobiletools.contacts.pro.adapters.GroupsAdapter
import com.simplemobiletools.contacts.pro.extensions.config
-import com.simplemobiletools.contacts.pro.extensions.contactClicked
import com.simplemobiletools.contacts.pro.extensions.getVisibleContactSources
import com.simplemobiletools.contacts.pro.helpers.*
+import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener
import com.simplemobiletools.contacts.pro.models.Contact
import com.simplemobiletools.contacts.pro.models.Group
import kotlinx.android.synthetic.main.fragment_layout.view.*
abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) : CoordinatorLayout(context, attributeSet) {
- protected var activity: MainActivity? = null
+ protected var activity: SimpleActivity? = null
protected var allContacts = ArrayList()
private var lastHashCode = 0
@@ -35,19 +36,23 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
var skipHashComparing = false
var forceListRedraw = false
- fun setupFragment(activity: MainActivity) {
+ fun setupFragment(activity: SimpleActivity) {
config = activity.config
if (this.activity == null) {
this.activity = activity
- fragment_fab.setOnClickListener {
- fabClicked()
+ fragment_fab?.setOnClickListener {
+ if (activity is InsertOrEditContactActivity) {
+ activity.fabClicked()
+ } else {
+ fabClicked()
+ }
}
- fragment_placeholder_2.setOnClickListener {
+ fragment_placeholder_2?.setOnClickListener {
placeholderClicked()
}
- fragment_placeholder_2.underlineText()
+ fragment_placeholder_2?.underlineText()
updateViewStuff()
when {
@@ -89,13 +94,13 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
if (this !is GroupsFragment) {
(fragment_list.adapter as? ContactsAdapter)?.apply {
config.sorting = if (startNameWithSurname) SORT_BY_SURNAME else SORT_BY_FIRST_NAME
- this@MyViewPagerFragment.activity!!.refreshContacts(CONTACTS_TAB_MASK or FAVORITES_TAB_MASK)
+ (this@MyViewPagerFragment.activity!! as MainActivity).refreshContacts(CONTACTS_TAB_MASK or FAVORITES_TAB_MASK)
}
}
}
fun refreshContacts(contacts: ArrayList) {
- if ((config.showTabs and CONTACTS_TAB_MASK == 0 && this is ContactsFragment) ||
+ if ((config.showTabs and CONTACTS_TAB_MASK == 0 && this is ContactsFragment && activity !is InsertOrEditContactActivity) ||
(config.showTabs and FAVORITES_TAB_MASK == 0 && this is FavoritesFragment) ||
(config.showTabs and GROUPS_TAB_MASK == 0 && this is GroupsFragment)) {
return
@@ -128,19 +133,16 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
private fun setupContacts(contacts: ArrayList) {
if (this is GroupsFragment) {
- setupGroupsAdapter(contacts)
+ setupGroupsAdapter(contacts) {
+ groupsIgnoringSearch = (fragment_list?.adapter as? GroupsAdapter)?.groups ?: ArrayList()
+ }
} else {
setupContactsFavoritesAdapter(contacts)
- }
-
- if (this is ContactsFragment || this is FavoritesFragment) {
contactsIgnoringSearch = (fragment_list?.adapter as? ContactsAdapter)?.contactItems ?: ArrayList()
- } else if (this is GroupsFragment) {
- groupsIgnoringSearch = (fragment_list?.adapter as? GroupsAdapter)?.groups ?: ArrayList()
}
}
- private fun setupGroupsAdapter(contacts: ArrayList) {
+ private fun setupGroupsAdapter(contacts: ArrayList, callback: () -> Unit) {
ContactsHelper(activity!!).getStoredGroups {
var storedGroups = it
contacts.forEach {
@@ -159,13 +161,12 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
val currAdapter = fragment_list.adapter
if (currAdapter == null) {
- GroupsAdapter(activity as SimpleActivity, storedGroups, activity, fragment_list, fragment_fastscroller) {
+ GroupsAdapter(activity as SimpleActivity, storedGroups, activity as RefreshContactsListener, fragment_list, fragment_fastscroller) {
Intent(activity, GroupContactsActivity::class.java).apply {
putExtra(GROUP, it as Group)
activity!!.startActivity(this)
}
}.apply {
- addVerticalDividers(true)
fragment_list.adapter = this
}
@@ -180,6 +181,8 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
updateItems(storedGroups)
}
}
+
+ callback()
}
}
@@ -188,11 +191,15 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
val currAdapter = fragment_list.adapter
if (currAdapter == null || forceListRedraw) {
forceListRedraw = false
- val location = if (this is FavoritesFragment) LOCATION_FAVORITES_TAB else LOCATION_CONTACTS_TAB
- ContactsAdapter(activity as SimpleActivity, contacts, activity, location, null, fragment_list, fragment_fastscroller) {
- activity?.contactClicked(it as Contact)
+ val location = when {
+ activity is InsertOrEditContactActivity -> LOCATION_INSERT_OR_EDIT
+ this is FavoritesFragment -> LOCATION_FAVORITES_TAB
+ else -> LOCATION_CONTACTS_TAB
+ }
+
+ ContactsAdapter(activity as SimpleActivity, contacts, activity as RefreshContactsListener, location, null, fragment_list, fragment_fastscroller) {
+ (activity as RefreshContactsListener).contactClicked(it as Contact)
}.apply {
- addVerticalDividers(true)
fragment_list.adapter = this
}
@@ -257,7 +264,7 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
}
if (filtered.isEmpty() && this@MyViewPagerFragment is FavoritesFragment) {
- fragment_placeholder.text = activity?.getString(R.string.no_items_found)
+ fragment_placeholder.text = activity?.getString(R.string.no_contacts_found)
}
fragment_placeholder.beVisibleIf(filtered.isEmpty())
@@ -276,8 +283,6 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
}
}
- private fun getProperText(text: String, shouldNormalize: Boolean) = if (shouldNormalize) text.normalizeString() else text
-
fun onSearchOpened() {
contactsIgnoringSearch = (fragment_list?.adapter as? ContactsAdapter)?.contactItems ?: ArrayList()
groupsIgnoringSearch = (fragment_list?.adapter as? GroupsAdapter)?.groups ?: ArrayList()
@@ -301,12 +306,12 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
context.updateTextColors(fragment_wrapper.parent as ViewGroup)
fragment_fastscroller.updateBubbleColors()
fragment_fastscroller.allowBubbleDisplay = config.showInfoBubble
- fragment_placeholder_2.setTextColor(context.getAdjustedPrimaryColor())
+ fragment_placeholder_2?.setTextColor(context.getAdjustedPrimaryColor())
}
private fun setupViewVisibility(hasItemsToShow: Boolean) {
- fragment_placeholder_2.beVisibleIf(!hasItemsToShow)
- fragment_placeholder.beVisibleIf(!hasItemsToShow)
+ fragment_placeholder_2?.beVisibleIf(!hasItemsToShow)
+ fragment_placeholder?.beVisibleIf(!hasItemsToShow)
fragment_list.beVisibleIf(hasItemsToShow)
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt
index 0098fbb3..bf6f15b7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt
@@ -29,7 +29,7 @@ class Config(context: Context) : BaseConfig(context) {
set(startNameWithSurname) = prefs.edit().putBoolean(START_NAME_WITH_SURNAME, startNameWithSurname).apply()
var lastUsedContactSource: String
- get() = prefs.getString(LAST_USED_CONTACT_SOURCE, "")
+ get() = prefs.getString(LAST_USED_CONTACT_SOURCE, "")!!
set(lastUsedContactSource) = prefs.edit().putString(LAST_USED_CONTACT_SOURCE, lastUsedContactSource).apply()
var onContactClick: Int
@@ -54,6 +54,10 @@ class Config(context: Context) : BaseConfig(context) {
set(showDialpadButton) = prefs.edit().putBoolean(SHOW_DIALPAD_BUTTON, showDialpadButton).apply()
var showDialpadLetters: Boolean
- get() = prefs.getBoolean(SHOW_DIALPAD_LETTERS, false)
+ get() = prefs.getBoolean(SHOW_DIALPAD_LETTERS, true)
set(showDialpadLetters) = prefs.edit().putBoolean(SHOW_DIALPAD_LETTERS, showDialpadLetters).apply()
+
+ var speedDial: String
+ get() = prefs.getString(SPEED_DIAL, "")!!
+ set(speedDial) = prefs.edit().putString(SPEED_DIAL, speedDial).apply()
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt
index e9d95de1..6bbad364 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt
@@ -1,6 +1,11 @@
package com.simplemobiletools.contacts.pro.helpers
import android.provider.ContactsContract.CommonDataKinds
+import android.telephony.PhoneNumberUtils
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.ForegroundColorSpan
+import com.simplemobiletools.commons.extensions.normalizeString
import com.simplemobiletools.contacts.pro.models.LocalContact
// shared prefs
@@ -16,6 +21,7 @@ const val SHOW_TABS = "show_tabs"
const val SHOW_CALL_CONFIRMATION = "show_call_confirmation"
const val SHOW_DIALPAD_BUTTON = "show_dialpad_button"
const val SHOW_DIALPAD_LETTERS = "show_dialpad_letters"
+const val SPEED_DIAL = "speed_dial"
const val CONTACT_ID = "contact_id"
const val SMT_PRIVATE = "smt_private" // used at the contact source of local contacts hidden from other apps
@@ -30,6 +36,8 @@ const val REQUEST_CODE_SET_DEFAULT_DIALER = 1
// extras used at third party intents
const val KEY_PHONE = "phone"
const val KEY_NAME = "name"
+const val KEY_EMAIL = "email"
+const val KEY_MAILTO = "mailto"
const val LOCATION_CONTACTS_TAB = 0
const val LOCATION_FAVORITES_TAB = 1
@@ -107,3 +115,20 @@ const val SIGNAL_PACKAGE = "org.thoughtcrime.securesms"
const val WHATSAPP_PACKAGE = "com.whatsapp"
fun getEmptyLocalContact() = LocalContact(0, "", "", "", "", "", "", null, ArrayList(), ArrayList(), ArrayList(), 0, ArrayList(), "", ArrayList(), "", "", ArrayList(), ArrayList())
+
+fun getProperText(text: String, shouldNormalize: Boolean) = if (shouldNormalize) text.normalizeString() else text
+
+fun highlightTextFromNumbers(name: String, textToHighlight: String, adjustedPrimaryColor: Int): SpannableString {
+ val spannableString = SpannableString(name)
+ val digits = PhoneNumberUtils.convertKeypadLettersToDigits(name)
+ if (digits.contains(textToHighlight)) {
+ val startIndex = digits.indexOf(textToHighlight, 0, true)
+ val endIndex = Math.min(startIndex + textToHighlight.length, name.length)
+ try {
+ spannableString.setSpan(ForegroundColorSpan(adjustedPrimaryColor), startIndex, endIndex, Spannable.SPAN_EXCLUSIVE_INCLUSIVE)
+ } catch (ignored: IndexOutOfBoundsException) {
+ }
+ }
+
+ return spannableString
+}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
index 7ceffafa..0eea63ef 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
@@ -67,7 +67,7 @@ class ContactsHelper(val context: Context) {
}
if (ignoredContactSources.isEmpty() && !getAll) {
- tempContacts.filter { displayContactSources.contains(it.source) }.groupBy { it.getNameToDisplay().toLowerCase()}.values.forEach { it ->
+ tempContacts.filter { displayContactSources.contains(it.source) }.groupBy { it.getNameToDisplay().toLowerCase() }.values.forEach { it ->
if (it.size == 1) {
resultContacts.add(it.first())
} else {
@@ -143,8 +143,8 @@ class ContactsHelper(val context: Context) {
val uri = ContactsContract.Data.CONTENT_URI
val projection = getContactProjection()
- val selection = "${ContactsContract.Data.MIMETYPE} = ?"
- val selectionArgs = arrayOf(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
+ val selection = "${ContactsContract.Data.MIMETYPE} = ? OR ${ContactsContract.Data.MIMETYPE} = ?"
+ val selectionArgs = arrayOf(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE, CommonDataKinds.Organization.CONTENT_ITEM_TYPE)
val sortOrder = getSortString()
var cursor: Cursor? = null
@@ -159,11 +159,21 @@ class ContactsHelper(val context: Context) {
}
val id = cursor.getIntValue(ContactsContract.Data.RAW_CONTACT_ID)
- val prefix = cursor.getStringValue(CommonDataKinds.StructuredName.PREFIX) ?: ""
- val firstName = cursor.getStringValue(CommonDataKinds.StructuredName.GIVEN_NAME) ?: ""
- val middleName = cursor.getStringValue(CommonDataKinds.StructuredName.MIDDLE_NAME) ?: ""
- val surname = cursor.getStringValue(CommonDataKinds.StructuredName.FAMILY_NAME) ?: ""
- val suffix = cursor.getStringValue(CommonDataKinds.StructuredName.SUFFIX) ?: ""
+ var prefix = ""
+ var firstName = ""
+ var middleName = ""
+ var surname = ""
+ var suffix = ""
+
+ // ignore names at Organization type contacts
+ if (cursor.getStringValue(ContactsContract.Data.MIMETYPE) == CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE) {
+ prefix = cursor.getStringValue(CommonDataKinds.StructuredName.PREFIX) ?: ""
+ firstName = cursor.getStringValue(CommonDataKinds.StructuredName.GIVEN_NAME) ?: ""
+ middleName = cursor.getStringValue(CommonDataKinds.StructuredName.MIDDLE_NAME) ?: ""
+ surname = cursor.getStringValue(CommonDataKinds.StructuredName.FAMILY_NAME) ?: ""
+ suffix = cursor.getStringValue(CommonDataKinds.StructuredName.SUFFIX) ?: ""
+ }
+
val nickname = ""
val photoUri = cursor.getStringValue(CommonDataKinds.StructuredName.PHOTO_URI) ?: ""
val numbers = ArrayList() // proper value is obtained below
@@ -788,14 +798,14 @@ class ContactsHelper(val context: Context) {
return LocalContactsHelper(context).getContactWithId(id)
}
- val selection = "${ContactsContract.Data.MIMETYPE} = ? AND ${ContactsContract.Data.RAW_CONTACT_ID} = ?"
- val selectionArgs = arrayOf(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE, id.toString())
+ val selection = "(${ContactsContract.Data.MIMETYPE} = ? OR ${ContactsContract.Data.MIMETYPE} = ?) AND ${ContactsContract.Data.RAW_CONTACT_ID} = ?"
+ val selectionArgs = arrayOf(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE, CommonDataKinds.Organization.CONTENT_ITEM_TYPE, id.toString())
return parseContactCursor(selection, selectionArgs)
}
fun getContactWithLookupKey(key: String): Contact? {
- val selection = "${ContactsContract.Data.MIMETYPE} = ? AND ${ContactsContract.Data.LOOKUP_KEY} = ?"
- val selectionArgs = arrayOf(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE, key)
+ val selection = "(${ContactsContract.Data.MIMETYPE} = ? OR ${ContactsContract.Data.MIMETYPE} = ?) AND ${ContactsContract.Data.LOOKUP_KEY} = ?"
+ val selectionArgs = arrayOf(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE, CommonDataKinds.Organization.CONTENT_ITEM_TYPE, key)
return parseContactCursor(selection, selectionArgs)
}
@@ -808,11 +818,22 @@ class ContactsHelper(val context: Context) {
cursor = context.contentResolver.query(uri, projection, selection, selectionArgs, null)
if (cursor?.moveToFirst() == true) {
val id = cursor.getIntValue(ContactsContract.Data.RAW_CONTACT_ID)
- val prefix = cursor.getStringValue(CommonDataKinds.StructuredName.PREFIX) ?: ""
- val firstName = cursor.getStringValue(CommonDataKinds.StructuredName.GIVEN_NAME) ?: ""
- val middleName = cursor.getStringValue(CommonDataKinds.StructuredName.MIDDLE_NAME) ?: ""
- val surname = cursor.getStringValue(CommonDataKinds.StructuredName.FAMILY_NAME) ?: ""
- val suffix = cursor.getStringValue(CommonDataKinds.StructuredName.SUFFIX) ?: ""
+
+ var prefix = ""
+ var firstName = ""
+ var middleName = ""
+ var surname = ""
+ var suffix = ""
+
+ // ignore names at Organization type contacts
+ if (cursor.getStringValue(ContactsContract.Data.MIMETYPE) == CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE) {
+ prefix = cursor.getStringValue(CommonDataKinds.StructuredName.PREFIX) ?: ""
+ firstName = cursor.getStringValue(CommonDataKinds.StructuredName.GIVEN_NAME) ?: ""
+ middleName = cursor.getStringValue(CommonDataKinds.StructuredName.MIDDLE_NAME) ?: ""
+ surname = cursor.getStringValue(CommonDataKinds.StructuredName.FAMILY_NAME) ?: ""
+ suffix = cursor.getStringValue(CommonDataKinds.StructuredName.SUFFIX) ?: ""
+ }
+
val nickname = getNicknames(id)[id] ?: ""
val photoUri = cursor.getStringValue(CommonDataKinds.Phone.PHOTO_URI) ?: ""
val number = getPhoneNumbers(id)[id] ?: ArrayList()
@@ -879,6 +900,7 @@ class ContactsHelper(val context: Context) {
private fun getContactSourceType(accountName: String) = getDeviceContactSources().firstOrNull { it.name == accountName }?.type ?: ""
private fun getContactProjection() = arrayOf(
+ ContactsContract.Data.MIMETYPE,
ContactsContract.Data.CONTACT_ID,
ContactsContract.Data.RAW_CONTACT_ID,
CommonDataKinds.StructuredName.PREFIX,
@@ -895,25 +917,19 @@ class ContactsHelper(val context: Context) {
private fun getSortString(): String {
val sorting = context.config.sorting
- var sort = when {
+ return when {
sorting and SORT_BY_FIRST_NAME != 0 -> "${CommonDataKinds.StructuredName.GIVEN_NAME} COLLATE NOCASE"
sorting and SORT_BY_MIDDLE_NAME != 0 -> "${CommonDataKinds.StructuredName.MIDDLE_NAME} COLLATE NOCASE"
sorting and SORT_BY_SURNAME != 0 -> "${CommonDataKinds.StructuredName.FAMILY_NAME} COLLATE NOCASE"
else -> CommonDataKinds.Phone.NUMBER
}
-
- if (sorting and SORT_DESCENDING != 0) {
- sort += " DESC"
- }
-
- return sort
}
private fun getRealContactId(id: Long): Int {
val uri = ContactsContract.Data.CONTENT_URI
val projection = getContactProjection()
- val selection = "${ContactsContract.Data.MIMETYPE} = ? AND ${ContactsContract.Data.RAW_CONTACT_ID} = ?"
- val selectionArgs = arrayOf(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE, id.toString())
+ val selection = "(${ContactsContract.Data.MIMETYPE} = ? OR ${ContactsContract.Data.MIMETYPE} = ?) AND ${ContactsContract.Data.RAW_CONTACT_ID} = ?"
+ val selectionArgs = arrayOf(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE, CommonDataKinds.Organization.CONTENT_ITEM_TYPE, id.toString())
var cursor: Cursor? = null
try {
cursor = context.contentResolver.query(uri, projection, selection, selectionArgs, null)
@@ -936,8 +952,8 @@ class ContactsHelper(val context: Context) {
try {
val operations = ArrayList()
ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI).apply {
- val selection = "${ContactsContract.Data.RAW_CONTACT_ID} = ? AND ${ContactsContract.Data.MIMETYPE} = ?"
- val selectionArgs = arrayOf(contact.id.toString(), CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
+ val selection = "${ContactsContract.Data.RAW_CONTACT_ID} = ? AND (${ContactsContract.Data.MIMETYPE} = ? OR ${ContactsContract.Data.MIMETYPE} = ?)"
+ val selectionArgs = arrayOf(contact.id.toString(), CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE, CommonDataKinds.Organization.CONTENT_ITEM_TYPE)
withSelection(selection, selectionArgs)
withValue(CommonDataKinds.StructuredName.PREFIX, contact.prefix)
withValue(CommonDataKinds.StructuredName.GIVEN_NAME, contact.firstName)
@@ -1250,8 +1266,6 @@ class ContactsHelper(val context: Context) {
ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI).apply {
withValue(ContactsContract.RawContacts.ACCOUNT_NAME, contact.source)
withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, getContactSourceType(contact.source))
- withValue(ContactsContract.RawContacts.DIRTY, 0)
- withValue(ContactsContract.RawContacts.DELETED, 0)
operations.add(build())
}
@@ -1433,7 +1447,7 @@ class ContactsHelper(val context: Context) {
val baseUri = ContentUris.withAppendedId(ContactsContract.RawContacts.CONTENT_URI, contactId)
val displayPhotoUri = Uri.withAppendedPath(baseUri, ContactsContract.RawContacts.DisplayPhoto.CONTENT_DIRECTORY)
val fileDescriptor = context.contentResolver.openAssetFileDescriptor(displayPhotoUri, "rw")
- val photoStream = fileDescriptor.createOutputStream()
+ val photoStream = fileDescriptor!!.createOutputStream()
photoStream.write(fullSizePhotoData)
photoStream.close()
fileDescriptor.close()
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt
index ef0d4daf..0f74e15f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/LocalContactsHelper.kt
@@ -16,9 +16,16 @@ import com.simplemobiletools.contacts.pro.models.LocalContact
import com.simplemobiletools.contacts.pro.models.Organization
class LocalContactsHelper(val context: Context) {
- fun getAllContacts() = context.contactsDB.getContacts().map { convertLocalContactToContact(it) }.toMutableList() as ArrayList
+ fun getAllContacts(): ArrayList {
+ val contacts = context.contactsDB.getContacts()
+ val storedGroups = ContactsHelper(context).getStoredGroupsSync()
+ return contacts.map { convertLocalContactToContact(it, storedGroups) }.toMutableList() as ArrayList
+ }
- fun getContactWithId(id: Int) = convertLocalContactToContact(context.contactsDB.getContactWithId(id))
+ fun getContactWithId(id: Int): Contact? {
+ val storedGroups = ContactsHelper(context).getStoredGroupsSync()
+ return convertLocalContactToContact(context.contactsDB.getContactWithId(id), storedGroups)
+ }
fun insertOrUpdateContact(contact: Contact): Boolean {
val localContact = convertContactToLocalContact(contact)
@@ -74,7 +81,7 @@ class LocalContactsHelper(val context: Context) {
return scaledSizePhotoData
}
- private fun convertLocalContactToContact(localContact: LocalContact?): Contact? {
+ private fun convertLocalContactToContact(localContact: LocalContact?, storedGroups: ArrayList): Contact? {
if (localContact == null) {
return null
}
@@ -89,8 +96,6 @@ class LocalContactsHelper(val context: Context) {
}
}
- val storedGroups = ContactsHelper(context).getStoredGroupsSync()
-
return context.getEmptyContact().apply {
id = localContact.id!!
prefix = localContact.prefix
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt
index d973db4e..50ee8763 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt
@@ -30,7 +30,7 @@ class VcfExporter {
private var contactsFailed = 0
fun exportContacts(activity: BaseSimpleActivity, file: File, contacts: ArrayList, showExportingToast: Boolean, callback: (result: ExportResult) -> Unit) {
- activity.getFileOutputStream(file.toFileDirItem(), true) {
+ activity.getFileOutputStream(file.toFileDirItem(activity), true) {
try {
if (it == null) {
callback(EXPORT_FAIL)
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RefreshContactsListener.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RefreshContactsListener.kt
index 0d59b444..1a917f56 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RefreshContactsListener.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/interfaces/RefreshContactsListener.kt
@@ -1,5 +1,9 @@
package com.simplemobiletools.contacts.pro.interfaces
+import com.simplemobiletools.contacts.pro.models.Contact
+
interface RefreshContactsListener {
fun refreshContacts(refreshTabsMask: Int)
+
+ fun contactClicked(contact: Contact)
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/SpeedDial.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/SpeedDial.kt
new file mode 100644
index 00000000..59e15396
--- /dev/null
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/SpeedDial.kt
@@ -0,0 +1,3 @@
+package com.simplemobiletools.contacts.pro.models
+
+data class SpeedDial(val id: Int, var number: String, var displayName: String)
diff --git a/app/src/main/res/layout/activity_insert_edit_contact.xml b/app/src/main/res/layout/activity_insert_edit_contact.xml
index d6d7b41a..2e28b29c 100644
--- a/app/src/main/res/layout/activity_insert_edit_contact.xml
+++ b/app/src/main/res/layout/activity_insert_edit_contact.xml
@@ -1,72 +1,69 @@
-
+
+
+ android:paddingTop="@dimen/medium_margin"
+ android:paddingEnd="@dimen/activity_margin"
+ android:paddingBottom="@dimen/medium_margin">
+ android:src="@drawable/ic_new_contact_vector" />
+ android:textSize="@dimen/big_text_size" />
+ android:textSize="@dimen/smaller_text_size" />
-
+ android:layout_below="@+id/select_contact_label" />
-
-
-
-
-
diff --git a/app/src/main/res/layout/activity_manage_speed_dial.xml b/app/src/main/res/layout/activity_manage_speed_dial.xml
new file mode 100644
index 00000000..927c961c
--- /dev/null
+++ b/app/src/main/res/layout/activity_manage_speed_dial.xml
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_select_contact.xml b/app/src/main/res/layout/activity_select_contact.xml
index 017e414e..ea4a0dab 100644
--- a/app/src/main/res/layout/activity_select_contact.xml
+++ b/app/src/main/res/layout/activity_select_contact.xml
@@ -1,6 +1,5 @@
-
+ android:visibility="gone" />
+ android:visibility="gone" />
+ app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" />
+ android:paddingStart="@dimen/normal_margin">
-
+
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index d5772d83..225776f3 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -29,7 +29,6 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin"
- android:paddingLeft="@dimen/medium_margin"
android:text="@string/customize_colors"/>
@@ -51,7 +50,6 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin"
- android:paddingLeft="@dimen/medium_margin"
android:text="@string/manage_shown_contact_fields"/>
@@ -73,7 +71,6 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin"
- android:paddingLeft="@dimen/medium_margin"
android:text="@string/manage_shown_tabs"/>
@@ -95,11 +92,31 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin"
- android:paddingLeft="@dimen/medium_margin"
android:text="@string/manage_blocked_numbers"/>
+
+
+
+
+
+
@@ -142,7 +158,6 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
- android:paddingLeft="@dimen/medium_margin"
android:text="@string/show_info_bubble"
app:switchPadding="@dimen/medium_margin"/>
@@ -166,7 +181,6 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
- android:paddingLeft="@dimen/medium_margin"
android:text="@string/show_contact_thumbnails"
app:switchPadding="@dimen/medium_margin"/>
@@ -190,7 +204,6 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
- android:paddingLeft="@dimen/medium_margin"
android:text="@string/show_phone_numbers"
app:switchPadding="@dimen/medium_margin"/>
@@ -214,7 +227,6 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
- android:paddingLeft="@dimen/medium_margin"
android:text="@string/show_only_contacts_with_numbers"
app:switchPadding="@dimen/medium_margin"/>
@@ -238,7 +250,6 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
- android:paddingLeft="@dimen/medium_margin"
android:text="@string/start_name_with_surname"
app:switchPadding="@dimen/medium_margin"/>
@@ -262,7 +273,6 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
- android:paddingLeft="@dimen/medium_margin"
android:text="@string/show_call_confirmation_dialog"
app:switchPadding="@dimen/medium_margin"/>
@@ -286,7 +296,6 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
- android:paddingLeft="@dimen/medium_margin"
android:text="@string/show_dialpad_button"
app:switchPadding="@dimen/medium_margin"/>
@@ -310,7 +319,6 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
- android:paddingLeft="@dimen/medium_margin"
android:text="@string/show_dialpad_letters"
app:switchPadding="@dimen/medium_margin"/>
@@ -333,7 +341,6 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/settings_on_contact_click"
- android:layout_toLeftOf="@+id/settings_on_contact_click"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/on_contact_click"/>
@@ -343,9 +350,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:layout_marginEnd="@dimen/small_margin"
- android:layout_marginRight="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
diff --git a/app/src/main/res/layout/item_add_favorite_with_number.xml b/app/src/main/res/layout/item_add_favorite_with_number.xml
index 7185a643..8a1ff174 100644
--- a/app/src/main/res/layout/item_add_favorite_with_number.xml
+++ b/app/src/main/res/layout/item_add_favorite_with_number.xml
@@ -1,6 +1,5 @@
-
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/medium_margin"
+ android:paddingEnd="@dimen/normal_margin"
+ android:paddingBottom="@dimen/medium_margin">
+ android:src="@drawable/ic_person_vector" />
+ tools:text="John Doe" />
+ tools:text="0123 456 789" />
+ android:gravity="center_vertical" />
diff --git a/app/src/main/res/layout/item_add_favorite_without_number.xml b/app/src/main/res/layout/item_add_favorite_without_number.xml
index 27c9bc4b..2519eb54 100644
--- a/app/src/main/res/layout/item_add_favorite_without_number.xml
+++ b/app/src/main/res/layout/item_add_favorite_without_number.xml
@@ -1,6 +1,5 @@
-
+ android:paddingTop="@dimen/tiny_margin"
+ android:paddingEnd="@dimen/normal_margin"
+ android:paddingBottom="@dimen/tiny_margin">
+ android:src="@drawable/ic_person_vector" />
+ tools:text="John Doe" />
+ android:gravity="center_vertical" />
diff --git a/app/src/main/res/layout/item_contact_with_number.xml b/app/src/main/res/layout/item_contact_with_number.xml
index 7b193be7..3a0dd8ca 100644
--- a/app/src/main/res/layout/item_contact_with_number.xml
+++ b/app/src/main/res/layout/item_contact_with_number.xml
@@ -1,6 +1,5 @@
-
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/medium_margin"
+ android:paddingEnd="@dimen/activity_margin"
+ android:paddingBottom="@dimen/medium_margin">
+ android:src="@drawable/ic_person_vector" />
+ tools:text="John Doe" />
+ tools:text="0123 456 789" />
diff --git a/app/src/main/res/layout/item_contact_without_number.xml b/app/src/main/res/layout/item_contact_without_number.xml
index 6473f2af..9ecbc4e5 100644
--- a/app/src/main/res/layout/item_contact_without_number.xml
+++ b/app/src/main/res/layout/item_contact_without_number.xml
@@ -1,6 +1,5 @@
-
+ android:paddingTop="@dimen/small_margin"
+ android:paddingEnd="@dimen/activity_margin"
+ android:paddingBottom="@dimen/small_margin">
+ android:src="@drawable/ic_person_vector" />
+ tools:text="John Doe" />
diff --git a/app/src/main/res/layout/item_group.xml b/app/src/main/res/layout/item_group.xml
index 9e4bcba9..08bb3b56 100644
--- a/app/src/main/res/layout/item_group.xml
+++ b/app/src/main/res/layout/item_group.xml
@@ -1,6 +1,5 @@
-
+ android:paddingTop="@dimen/tiny_margin"
+ android:paddingEnd="@dimen/activity_margin"
+ android:paddingBottom="@dimen/tiny_margin">
+ android:src="@drawable/ic_group_vector" />
+ tools:text="Family" />
diff --git a/app/src/main/res/layout/layout_select_contact.xml b/app/src/main/res/layout/layout_select_contact.xml
index d2dde128..f6efaa90 100644
--- a/app/src/main/res/layout/layout_select_contact.xml
+++ b/app/src/main/res/layout/layout_select_contact.xml
@@ -12,20 +12,18 @@
android:layout_height="wrap_content"
android:clipToPadding="false"
android:scrollbars="none"
- app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"/>
+ app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" />
-
+
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
index 8eca10f7..1bb9ba9d 100644
--- a/app/src/main/res/menu/menu.xml
+++ b/app/src/main/res/menu/menu.xml
@@ -17,6 +17,11 @@
android:icon="@drawable/ic_filter_vector"
android:title="@string/filter"
app:showAsAction="ifRoom"/>
+
-
+
diff --git a/app/src/main/res/menu/menu_select_activity.xml b/app/src/main/res/menu/menu_select_activity.xml
index ed3d4291..78fa6907 100644
--- a/app/src/main/res/menu/menu_select_activity.xml
+++ b/app/src/main/res/menu/menu_select_activity.xml
@@ -1,6 +1,12 @@