diff --git a/app/build.gradle b/app/build.gradle index c6d54d0..233fca3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,15 +3,26 @@ apply plugin: 'android-apt' apply plugin: 'realm-android' android { - compileSdkVersion 24 - buildToolsVersion "24.0.1" + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + dataBinding { + enabled = true + } + + + compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) + buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION defaultConfig { - applicationId "com.codeest.geeknews" - minSdkVersion 21 - targetSdkVersion 24 - versionCode 2 - versionName "1.0.1" + applicationId project.APP_APPLICATIONID + minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION) + targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) + versionCode Integer.parseInt(project.APP_VERSIONCODE) + versionName project.APP_VERSIONNAME + multiDexEnabled true } buildTypes { @@ -28,54 +39,66 @@ android { } } +ext { + appCompat = "25.0.1" + easyPermissions="0.2.1" + retrofit = "2.0.2" + dagger = "2.0.2" + reactivex = "1.1.0" + butterknife = "8.2.1" + blockcanary = "1.2.1" + leakcanary = "1.4-beta2" +} + dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile files('libs/tbs_sdk_thirdapp_v2.2.0.1096_36549_sharewithdownload_withoutGame_obfs_20160830_211645.jar') - testCompile 'junit:junit:4.12' + //ui - compile 'com.android.support:appcompat-v7:24.1.1' - compile 'com.android.support:design:24.1.1' - compile 'com.android.support:recyclerview-v7:24.1.1' - compile 'com.android.support:cardview-v7:24.1.1' + compile "com.android.support:recyclerview-v7:${appCompat}" + compile "com.android.support:appcompat-v7:${appCompat}" + compile "com.android.support:cardview-v7:${appCompat}" + compile "com.android.support:design:${appCompat}" + compile "pub.devrel:easypermissions:${easyPermissions}" //rx - compile 'io.reactivex:rxjava:1.1.0' - compile 'io.reactivex:rxandroid:1.1.0' + compile "io.reactivex:rxjava:${reactivex}" + compile "io.reactivex:rxandroid:${reactivex}" compile 'com.jakewharton.rxbinding:rxbinding:0.4.0' //network - compile 'com.google.code.gson:gson:2.4' - compile 'com.squareup.retrofit2:retrofit:2.0.2' - compile 'com.squareup.retrofit2:converter-gson:2.0.2' - compile 'com.squareup.retrofit2:adapter-rxjava:2.0.2' + compile 'com.google.code.gson:gson:2.7' + compile "com.squareup.retrofit2:retrofit:${retrofit}" + compile "com.squareup.retrofit2:converter-gson:${retrofit}" + compile "com.squareup.retrofit2:adapter-rxjava:${retrofit}" compile 'com.squareup.okhttp3:okhttp:3.2.0' compile 'com.squareup.okhttp3:logging-interceptor:3.0.1' compile 'com.github.bumptech.glide:glide:3.7.0' compile 'com.github.bumptech.glide:okhttp3-integration:1.4.0@aar' //di - compile 'com.google.dagger:dagger:2.0.2' - compile 'com.google.dagger:dagger-compiler:2.0.2' - compile 'com.jakewharton:butterknife:8.2.1' - apt 'com.jakewharton:butterknife-compiler:8.2.1' + compile "com.google.dagger:dagger:${dagger}" + compile "com.google.dagger:dagger-compiler:${dagger}" + compile "com.jakewharton:butterknife:${butterknife}" + apt "com.jakewharton:butterknife-compiler:${butterknife}" provided 'org.glassfish:javax.annotation:10.0-b28' //other compile 'com.umeng.analytics:analytics:latest.integration' compile 'com.orhanobut:logger:1.15' - compile 'me.yokeyword:fragmentation:0.7.9' + compile 'me.yokeyword:fragmentation:0.8.4' //widget compile 'com.victor:lib:1.0.4' compile 'com.prolificinteractive:material-calendarview:1.4.0' - compile 'net.opacapp:multiline-collapsingtoolbar:1.2.2' - compile 'com.github.chrisbanes:PhotoView:1.3.0' + compile 'net.opacapp:multiline-collapsingtoolbar:1.3.1' + compile 'com.github.chrisbanes:PhotoView:1.3.1' compile 'com.miguelcatalan:materialsearchview:1.4.0' //canary - debugCompile 'com.github.moduth:blockcanary-android:1.2.1' - releaseCompile 'com.github.moduth:blockcanary-no-op:1.2.1' - debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2' - releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2' + debugCompile "com.github.moduth:blockcanary-android:${blockcanary}" + releaseCompile "com.github.moduth:blockcanary-no-op:${blockcanary}" + debugCompile "com.squareup.leakcanary:leakcanary-android:${leakcanary}" + releaseCompile "com.squareup.leakcanary:leakcanary-android-no-op:${leakcanary}" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ee4a690..20f3cec 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -62,6 +62,11 @@ android:launchMode="singleTop" android:screenOrientation="portrait"/> + + diff --git a/app/src/main/assets/licenses-box/AOSP.txt b/app/src/main/assets/licenses-box/AOSP.txt new file mode 100644 index 0000000..8b237e5 --- /dev/null +++ b/app/src/main/assets/licenses-box/AOSP.txt @@ -0,0 +1,15 @@ + The Android Open Source Project + +Copyright (c) + +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 + + http://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/src/main/assets/licenses-box/Apache-LICENSE-2.0.txt b/app/src/main/assets/licenses-box/Apache-LICENSE-2.0.txt new file mode 100644 index 0000000..ac6be9f --- /dev/null +++ b/app/src/main/assets/licenses-box/Apache-LICENSE-2.0.txt @@ -0,0 +1,13 @@ + Copyright (c) + +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 + + http://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. \ No newline at end of file diff --git a/app/src/main/assets/licenses-box/CDDL+GPL.txt b/app/src/main/assets/licenses-box/CDDL+GPL.txt new file mode 100644 index 0000000..a5b2942 --- /dev/null +++ b/app/src/main/assets/licenses-box/CDDL+GPL.txt @@ -0,0 +1,267 @@ +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +Copyright (c) + +1. Definitions. + +1.1. “Contributor” means each individual or entity that creates or contributes to the creation of Modifications. + +1.2. “Contributor Version” means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor. + +1.3. “Covered Software” means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof. + +1.4. “Executable” means the Covered Software in any form other than Source Code. + +1.5. “Initial Developer” means the individual or entity that first makes Original Software available under this License. + +1.6. “Larger Work” means a work which combines Covered Software or portions thereof with code not governed by the terms of this License. + +1.7. “License” means this document. + +1.8. “Licensable” means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. + +1.9. “Modifications” means the Source Code and Executable form of any of the following: + +A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications; + +B. Any new file that contains any part of the Original Software or previous Modification; or + +C. Any new file that is contributed or otherwise made available under the terms of this License. + +1.10. “Original Software” means the Source Code and Executable form of computer software code that is originally released under this License. + +1.11. “Patent Claims” means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. + +1.12. “Source Code” means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code. + +1.13. “You” (or “Your”) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, “You” includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, “control” means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. + +2. License Grants. + +2.1. The Initial Developer Grant. + +Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof). + +(c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License. + +(d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices. + +2.2. Contributor Grant. + +Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination). + +(c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party. + +(d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor. + +3. Distribution Obligations. + +3.1. Availability of Source Code. + +Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange. + +3.2. Modifications. + +The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License. + +3.3. Required Notices. + +You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer. + +3.4. Application of Additional Terms. + +You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients’ rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. + +3.5. Distribution of Executable Versions. + +You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipient’s rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. + +3.6. Larger Works. + +You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software. + +4. Versions of the License. + +4.1. New Versions. + +Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License. + +4.2. Effect of New Versions. + +You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward. + +4.3. Modified Versions. + +When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License. + +5. DISCLAIMER OF WARRANTY. + +COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN “AS IS” BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +6. TERMINATION. + +6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. + +6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as “Participant”) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written agreement with Participant. + +6.3. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination. + +7. LIMITATION OF LIABILITY. + +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY’S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +8. U.S. GOVERNMENT END USERS. + +The Covered Software is a “commercial item,” as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of “commercial computer software” (as that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and “commercial computer software documentation” as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License. + +9. MISCELLANEOUS. + +This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction’s conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys’ fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software. + +10. RESPONSIBILITY FOR CLAIMS. + +As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. + +NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) + +The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California. + +The GNU General Public License (GPL) Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. 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. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), 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 distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the 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 a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE 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. + +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 convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + +One line to give the program's name and a brief idea of what it does. + +Copyright (C) + +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 2 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, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + +Gnomovision version 69, Copyright (C) year name of author +Gnomovision 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, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. + +signature of Ty Coon, 1 April 1989 +Ty Coon, President of Vice + +This 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 Library General Public License instead of this License. + +"CLASSPATH" EXCEPTION TO THE GPL VERSION 2 + +Certain source files distributed by Sun Microsystems, Inc. are subject to the following clarification and special exception to the GPL Version 2, but only where Sun has expressly included in the particular source file's header the words +"Sun designates this particular file as subject to the "Classpath" exception as provided by Sun in the License file that accompanied this code." + +Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License Version 2 cover the whole combination. + +As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module.? An independent module is a module which is not derived from or based on this library.? If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so.? If you do not wish to do so, delete this exception statement from your version.ILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/app/src/main/assets/licenses-box/Prolific Interactive(MIT).txt b/app/src/main/assets/licenses-box/Prolific Interactive(MIT).txt new file mode 100644 index 0000000..afc74b3 --- /dev/null +++ b/app/src/main/assets/licenses-box/Prolific Interactive(MIT).txt @@ -0,0 +1,19 @@ +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/app/src/main/assets/licenses-list.json b/app/src/main/assets/licenses-list.json new file mode 100644 index 0000000..9037cca --- /dev/null +++ b/app/src/main/assets/licenses-list.json @@ -0,0 +1,150 @@ +{ + "Licenses": [ + { + "name": "AOSP", + "description": "The Android Open Source Project", + "libraries": [ + { + "name": "com.android.support:design" + }, + { + "name": "com.android.support:recyclerview-v7" + }, + { + "name": "com.android.support:appcompat-v7" + }, + { + "name": "com.android.support:cardview-v7" + } + ] + }, + { + "name": "Apache-LICENSE-2.0", + "description": "Apache License, Version 2.0", + "libraries": [ + { + "name": "pub.devrel:easypermissions", + "owner": "https://github.com/googlesamples" + }, + { + "name": "io.reactivex:rxandroid", + "owner": "The RxAndroid authors" + }, + { + "name": "io.reactivex:rxjava", + "owner": "Netflix, Inc." + }, + { + "name": "com.jakewharton.rxbinding", + "owner": "Jake Wharton" + }, + { + "name": "com.google.code.gson:gson", + "owner": "Google Inc." + }, + { + "name": "Glide", + "owner": "bumptech/glide" + }, + { + "name": "com.github.bumptech.glide:okhttp3-integration", + "owner": "bumptech/glide" + }, + { + "name": "com.squareup.retrofit2", + "owner": "Square, Inc." + }, + { + "name": "com.squareup.retrofit2:converter-gson", + "owner": "Square, Inc." + }, + { + "name": "com.squareup.retrofit2:adapter-rxjava", + "owner": "Square, Inc." + }, + { + "name": "okhttp", + "owner": "Square, Inc." + }, + { + "name": "com.squareup.okhttp3:logging-interceptor", + "owner": "Square, Inc." + }, + { + "name": "com.google.dagger:dagger", + "owner": "Google" + }, + { + "name": "com.google.dagger:dagger-compiler", + "owner": "Google" + }, + { + "name": "com.jakewharton:butterknife", + "owner": "Jake Wharton" + }, + { + "name": "com.jakewharton:butterknife-compiler", + "owner": "Jake Wharton" + }, + { + "name": "com.umeng.analytics:analytics:latest.integration", + "owner": "umeng.analytics" + }, + { + "name": "com.orhanobut:logger", + "owner": "https://github.com/orhanobut" + }, + { + "name": "me.yokeyword:fragmentation", + "owner": "https://github.com/YoKeyword" + }, + { + "name": "com.victor:lib", + "owner": "https://github.com/yankai-victor/" + }, + { + "name": "net.opacapp:multiline-collapsingtoolbar", + "owner": "https://github.com/opacapp/" + }, + { + "name": "com.github.chrisbanes:PhotoView", + "owner": "Chris Banes" + }, + { + "name": "com.miguelcatalan:materialsearchview", + "owner": "https://github.com/MiguelCatalan/" + }, + { + "name": "com.github.moduth:blockcanary", + "owner": "MarkZhai" + }, + { + "name": "com.squareup.leakcanary", + "owner": "Square, Inc." + } + ] + }, + { + "name": "Prolific Interactive(MIT)", + "description": "Prolific Interactive", + "libraries": [ + { + "name": "com.prolificinteractive:material-calendarview", + "owner": "Prolific Interactive", + "copyright": "2016" + } + ] + }, + { + "name": "CDDL+GPL", + "description": "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)", + "libraries": [ + { + "name": "org.glassfish:javax.annotation", + "owner": "org.glassfish", + "copyright": "2008" + } + ] + } + ] +} diff --git a/app/src/main/java/com/codeest/geeknews/app/App.java b/app/src/main/java/com/codeest/geeknews/app/App.java index 42c6c6a..776a334 100755 --- a/app/src/main/java/com/codeest/geeknews/app/App.java +++ b/app/src/main/java/com/codeest/geeknews/app/App.java @@ -3,6 +3,7 @@ import android.app.Activity; import android.app.Application; import android.content.Context; +import android.support.v4.app.ActivityCompat; import android.support.v7.app.AppCompatDelegate; import android.util.DisplayMetrics; import android.view.Display; @@ -93,7 +94,7 @@ public void exitApp() { if (allActivities != null) { synchronized (allActivities) { for (Activity act : allActivities) { - act.finish(); + ActivityCompat.finishAfterTransition(act); } } } diff --git a/app/src/main/java/com/codeest/geeknews/app/Constants.java b/app/src/main/java/com/codeest/geeknews/app/Constants.java index dba8a69..8fdda55 100755 --- a/app/src/main/java/com/codeest/geeknews/app/Constants.java +++ b/app/src/main/java/com/codeest/geeknews/app/Constants.java @@ -31,6 +31,8 @@ public class Constants { public static final int TYPE_ABOUT = 110; + public static final int TYPE_LICENSES = 111; + //================= KEY ==================== // public static final String KEY_API = "f95283476506aa756559dd28a56f0c0b"; //需要APIKEY请去 http://apistore.baidu.com/ 申请,复用会减少访问可用次数 diff --git a/app/src/main/java/com/codeest/geeknews/base/BaseActivity.java b/app/src/main/java/com/codeest/geeknews/base/BaseActivity.java index 981832c..0745b91 100755 --- a/app/src/main/java/com/codeest/geeknews/base/BaseActivity.java +++ b/app/src/main/java/com/codeest/geeknews/base/BaseActivity.java @@ -3,6 +3,7 @@ import android.app.Activity; import android.os.Bundle; import android.support.annotation.Nullable; +import android.support.v4.app.ActivityCompat; import android.support.v7.app.AppCompatDelegate; import android.support.v7.widget.Toolbar; import android.view.View; @@ -100,6 +101,15 @@ public void useNightMode(boolean isNight) { recreate(); } + @Override + public void onBackPressedSupport() { + if (getSupportFragmentManager().getBackStackEntryCount() > 1) { + pop(); + } else { + ActivityCompat.finishAfterTransition(this); + } + } + protected abstract void initInject(); protected abstract int getLayout(); protected abstract void initEventAndData(); diff --git a/app/src/main/java/com/codeest/geeknews/base/BaseFragment.java b/app/src/main/java/com/codeest/geeknews/base/BaseFragment.java index ebe1901..e93d92d 100755 --- a/app/src/main/java/com/codeest/geeknews/base/BaseFragment.java +++ b/app/src/main/java/com/codeest/geeknews/base/BaseFragment.java @@ -71,7 +71,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { initEventAndData(); } } else { - if (!isSupportHidden()) { + if (isSupportVisible()) { isInited = true; initEventAndData(); } diff --git a/app/src/main/java/com/codeest/geeknews/base/SimpleFragment.java b/app/src/main/java/com/codeest/geeknews/base/SimpleFragment.java index 3f5b029..63519fb 100644 --- a/app/src/main/java/com/codeest/geeknews/base/SimpleFragment.java +++ b/app/src/main/java/com/codeest/geeknews/base/SimpleFragment.java @@ -51,7 +51,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { initEventAndData(); } } else { - if (!isSupportHidden()) { + if (isSupportVisible()) { isInited = true; initEventAndData(); } diff --git a/app/src/main/java/com/codeest/geeknews/ui/licenses/Library.java b/app/src/main/java/com/codeest/geeknews/ui/licenses/Library.java new file mode 100644 index 0000000..2203fa4 --- /dev/null +++ b/app/src/main/java/com/codeest/geeknews/ui/licenses/Library.java @@ -0,0 +1,34 @@ +package com.codeest.geeknews.ui.licenses; + + +import com.google.gson.annotations.SerializedName; + +final class Library { + @SerializedName("name") private String mName; + @SerializedName("owner") private String mOwner; + @SerializedName("copyright") private String mCopyright; + + public String getName() { + return mName; + } + + public void setName(String name) { + mName = name; + } + + public String getOwner() { + return mOwner; + } + + public void setOwner(String owner) { + mOwner = owner; + } + + public String getCopyright() { + return mCopyright; + } + + public void setCopyright(String copyright) { + mCopyright = copyright; + } +} diff --git a/app/src/main/java/com/codeest/geeknews/ui/licenses/License.java b/app/src/main/java/com/codeest/geeknews/ui/licenses/License.java new file mode 100644 index 0000000..3a6b07c --- /dev/null +++ b/app/src/main/java/com/codeest/geeknews/ui/licenses/License.java @@ -0,0 +1,36 @@ +package com.codeest.geeknews.ui.licenses; + + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +final class License { + @SerializedName("name") private String mName; + @SerializedName("description") private String mDescription; + @SerializedName("libraries") private List mLibraries; + + public String getDescription() { + return mDescription; + } + + public void setDescription(String description) { + mDescription = description; + } + + public String getName() { + return mName; + } + + public void setName(String name) { + mName = name; + } + + public List getLibraries() { + return mLibraries; + } + + public void setLibraries(List libraries) { + mLibraries = libraries; + } +} diff --git a/app/src/main/java/com/codeest/geeknews/ui/licenses/Licenses.java b/app/src/main/java/com/codeest/geeknews/ui/licenses/Licenses.java new file mode 100644 index 0000000..723e96a --- /dev/null +++ b/app/src/main/java/com/codeest/geeknews/ui/licenses/Licenses.java @@ -0,0 +1,18 @@ +package com.codeest.geeknews.ui.licenses; + + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +final class Licenses { + @SerializedName("Licenses") private List mLicenses; + + public List getLicenses() { + return mLicenses; + } + + public void setLicenses(List licenses) { + mLicenses = licenses; + } +} diff --git a/app/src/main/java/com/codeest/geeknews/ui/licenses/LicensesActivity.java b/app/src/main/java/com/codeest/geeknews/ui/licenses/LicensesActivity.java new file mode 100644 index 0000000..a115823 --- /dev/null +++ b/app/src/main/java/com/codeest/geeknews/ui/licenses/LicensesActivity.java @@ -0,0 +1,45 @@ +package com.codeest.geeknews.ui.licenses; + +import android.app.Activity; +import android.content.Intent; +import android.databinding.DataBindingUtil; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v4.app.ActivityCompat; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; +import android.view.MenuItem; + +import com.codeest.geeknews.R; +import com.codeest.geeknews.databinding.ActivityLicencesBinding; + + +public final class LicensesActivity extends AppCompatActivity { + + private static final int LAYOUT = R.layout.activity_licences; + + public static void showInstance(Activity cxt) { + Intent intent = new Intent(cxt, LicensesActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP); + ActivityCompat.startActivity(cxt, intent, Bundle.EMPTY); + } + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + ActivityLicencesBinding binding = DataBindingUtil.setContentView(this, LAYOUT); + setSupportActionBar(binding.toolbar); + final ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + actionBar.setDisplayHomeAsUpEnabled(true); + } + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == android.R.id.home) { + ActivityCompat.finishAfterTransition(this); + } + return super.onOptionsItemSelected(item); + } +} diff --git a/app/src/main/java/com/codeest/geeknews/ui/licenses/LicensesFragment.java b/app/src/main/java/com/codeest/geeknews/ui/licenses/LicensesFragment.java new file mode 100644 index 0000000..7543589 --- /dev/null +++ b/app/src/main/java/com/codeest/geeknews/ui/licenses/LicensesFragment.java @@ -0,0 +1,247 @@ +package com.codeest.geeknews.ui.licenses; + +import android.content.Context; +import android.databinding.DataBindingUtil; +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.v4.app.LoaderManager; +import android.support.v4.content.AsyncTaskLoader; +import android.support.v4.content.Loader; +import android.support.v4.util.ArrayMap; +import android.support.v7.app.AppCompatDialogFragment; +import android.text.TextUtils; +import android.util.Pair; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseExpandableListAdapter; +import android.widget.ExpandableListAdapter; +import android.widget.ExpandableListView; + +import com.codeest.geeknews.R; +import com.codeest.geeknews.databinding.ChildBinding; +import com.codeest.geeknews.databinding.FragmentLicencesBinding; +import com.codeest.geeknews.databinding.GroupBinding; +import com.google.gson.Gson; + +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.List; + +import static android.databinding.DataBindingUtil.inflate; + + +public final class LicensesFragment extends AppCompatDialogFragment { + private static final int LAYOUT = R.layout.fragment_licences; + private static final int ID_LOAD_LICENCES_TASK = 0x54; + private static final String LICENCES_LIST_JSON = "licenses-list.json"; + private FragmentLicencesBinding mBinding; + private static final Gson gson = new Gson(); + + @Override + public void onHiddenChanged(boolean hidden) { + super.onHiddenChanged(hidden); + if (hidden) { + collapseExpandedGroup(); + } + } + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + mBinding = DataBindingUtil.inflate(inflater, LAYOUT, container, getShowsDialog()); + return mBinding.getRoot(); + } + + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + loadLicences(); + } + + private void collapseExpandedGroup() { + ExpandableListAdapter adapter = mBinding.licencesList.getExpandableListAdapter(); + if (adapter == null) { + return; + } + for (int groupPos = 0, cnt = adapter.getGroupCount(); + groupPos < cnt; + groupPos++) { + if (mBinding.licencesList.isGroupExpanded(groupPos)) { + mBinding.licencesList.collapseGroup(groupPos); + } + } + } + + private void loadLicences() { + getLoaderManager().initLoader(ID_LOAD_LICENCES_TASK, Bundle.EMPTY, new LoaderManager.LoaderCallbacks() { + @Override + public Loader onCreateLoader(int id, Bundle args) { + return new AsyncTaskLoader(getContext()) { + @Override + public Licenses loadInBackground() { + Licenses licenses; + try { + licenses = gson.fromJson(new InputStreamReader(getContext().getAssets() + .open(LICENCES_LIST_JSON)), Licenses.class); + } catch (IOException e) { + licenses = null; + } + return licenses; + } + }; + } + + @Override + public void onLoadFinished(Loader loader, Licenses licenses) { + if (licenses != null) { + LicencesListAdapter adapter = new LicencesListAdapter(licenses); + mBinding.licensesCountTv.setText(getString(R.string.software_licenses_count, licenses.getLicenses().size(), adapter.getGroupCount())); + ExpandableListView expListView = mBinding.licencesList; + if (expListView != null) { + expListView.setAdapter(adapter); + } + } + } + + @Override + public void onLoaderReset(Loader loader) { + + } + }).forceLoad(); + } + + + private static final class LicencesListAdapter extends BaseExpandableListAdapter { + private static final String LICENCES_BOX = "licenses-box"; + private static final String COPYRIGHT_HOLDERS = ""; + private static final String YEAR = ""; + private static final String LICENCE_BOX_LOCATION_FORMAT = "%s/%s.txt"; + private static final int LAYOUT_GROUP = R.layout.list_licences_item_group; + private static final int LAYOUT_CHILD = R.layout.list_licences_item_child; + private final Licenses mLicenses; + private final int mLicencesCount; + private final ArrayMap> mLibraryList = new ArrayMap<>();//Pair contains licence's name and description. + private final ArrayMap mLicenceContentList = new ArrayMap<>(); + + public LicencesListAdapter(Licenses licenses) { + mLicenses = licenses; + List licencesList = mLicenses.getLicenses(); + for (License license : licencesList) { + List libraries = license.getLibraries(); + for (Library library : libraries) { + mLibraryList.put(library, new Pair<>(license.getName(), license.getDescription())); + } + } + mLicencesCount = mLibraryList.size(); + } + + private static String loadLicencesContent(Context cxt, @NonNull final String licenceName) { + String licenceLocation = String.format(LICENCE_BOX_LOCATION_FORMAT, LICENCES_BOX, licenceName); + String licenceContent; + try { + licenceContent = LicensesUtils.readTextFile(cxt.getAssets() + .open(licenceLocation)); + } catch (IOException e) { + licenceContent = null; + } + return licenceContent; + } + + public int getGroupCount() { + return mLicencesCount; + } + + public int getChildrenCount(int groupPosition) { + return 1; + } + + public Object getGroup(int groupPosition) { + throw new UnsupportedOperationException("This adapter doesn't need group."); + } + + public Object getChild(int groupPosition, int childPosition) { + throw new UnsupportedOperationException("This adapter doesn't need children."); + } + + public long getGroupId(int groupPosition) { + return groupPosition; + } + + public long getChildId(int groupPosition, int childPosition) { + return childPosition * childPosition; + } + + public boolean hasStableIds() { + return true; + } + + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + GroupBinding binding; + if (convertView == null) { + binding = inflate(LayoutInflater.from(parent.getContext()), LAYOUT_GROUP, parent, false); + convertView = binding.getRoot(); + convertView.setTag(binding); + } else { + binding = (GroupBinding) convertView.getTag(); + } + Library library = mLibraryList.keyAt(groupPosition); + Pair nameDesc = mLibraryList.get(library); + + binding.setTitle(library.getName()); + binding.setDescription(nameDesc.second); + binding.executePendingBindings(); + return convertView; + } + + public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + ChildBinding binding; + if (convertView == null) { + binding = inflate(LayoutInflater.from(parent.getContext()), LAYOUT_CHILD, parent, false); + convertView = binding.getRoot(); + convertView.setTag(binding); + } else { + binding = (ChildBinding) convertView.getTag(); + } + + String content; + Library library = mLibraryList.keyAt(groupPosition); + Pair nameDesc = mLibraryList.get(library); + //Licence content will be read from disk firstly and from memory next time. + if (mLicenceContentList.get(nameDesc.first) == null) { + content = loadLicencesContent(parent.getContext(), nameDesc.first); + mLicenceContentList.put(nameDesc.first, content); + } else { + content = mLicenceContentList.get(nameDesc.first); + } + + if (content.contains(YEAR) && content.contains(COPYRIGHT_HOLDERS)) { + content = content.replace(YEAR, + TextUtils.isEmpty(library.getCopyright()) ? + "" : + library.getCopyright()) + .replace(COPYRIGHT_HOLDERS, + TextUtils.isEmpty(library.getOwner()) ? + "" : + library.getOwner()); + } + binding.getRoot() + .setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { +// EventBus.getDefault() +// .post(new CloseExpandableListGroupEvent(groupPosition)); + } + }); + binding.setContent(content); + binding.executePendingBindings(); + return convertView; + } + + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + + } +} diff --git a/app/src/main/java/com/codeest/geeknews/ui/licenses/LicensesUtils.java b/app/src/main/java/com/codeest/geeknews/ui/licenses/LicensesUtils.java new file mode 100644 index 0000000..705cb63 --- /dev/null +++ b/app/src/main/java/com/codeest/geeknews/ui/licenses/LicensesUtils.java @@ -0,0 +1,44 @@ +package com.codeest.geeknews.ui.licenses; + +import android.content.Context; +import android.provider.Settings; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + +final class LicensesUtils { + + private LicensesUtils() { + + } + + public static String readTextFile(InputStream inputStream) { + InputStreamReader inputreader = new InputStreamReader(inputStream); + BufferedReader buffreader = new BufferedReader(inputreader); + StringBuilder text = new StringBuilder(); + + String line; + try { + while ((line = buffreader.readLine()) != null) { + text.append(line); + text.append('\n'); + } + } catch (IOException var6) { + return null; + } + + return text.toString(); + } + + public static boolean isAirplaneModeOn(Context context) { + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) { + /* API 17 and above */ + return Settings.Global.getInt(context.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0) != 0; + } else { + /* below */ + return Settings.System.getInt(context.getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 0) != 0; + } + } +} diff --git a/app/src/main/java/com/codeest/geeknews/ui/main/activity/MainActivity.java b/app/src/main/java/com/codeest/geeknews/ui/main/activity/MainActivity.java index cbe1d16..fde3c10 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/main/activity/MainActivity.java +++ b/app/src/main/java/com/codeest/geeknews/ui/main/activity/MainActivity.java @@ -19,6 +19,7 @@ import com.codeest.geeknews.presenter.MainPresenter; import com.codeest.geeknews.presenter.contract.MainContract; import com.codeest.geeknews.ui.gank.fragment.GankMainFragment; +import com.codeest.geeknews.ui.licenses.LicensesActivity; import com.codeest.geeknews.ui.main.fragment.AboutFragment; import com.codeest.geeknews.ui.main.fragment.LikeFragment; import com.codeest.geeknews.ui.main.fragment.SettingFragment; @@ -129,6 +130,10 @@ public boolean onNavigationItemSelected(MenuItem menuItem) { showFragment = Constants.TYPE_ABOUT; mSearchMenuItem.setVisible(false); break; + case R.id.drawer_licences: + LicensesActivity.showInstance(MainActivity.this); + mDrawerLayout.closeDrawers(); + return true; } if(mLastMenuItem != null) { mLastMenuItem.setChecked(false); diff --git a/app/src/main/java/com/codeest/geeknews/ui/main/activity/WelcomeActivity.java b/app/src/main/java/com/codeest/geeknews/ui/main/activity/WelcomeActivity.java index a384a8f..26eb128 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/main/activity/WelcomeActivity.java +++ b/app/src/main/java/com/codeest/geeknews/ui/main/activity/WelcomeActivity.java @@ -1,6 +1,11 @@ package com.codeest.geeknews.ui.main.activity; +import android.Manifest; +import android.annotation.SuppressLint; +import android.content.DialogInterface; import android.content.Intent; +import android.support.annotation.NonNull; +import android.support.v4.app.ActivityCompat; import android.widget.ImageView; import android.widget.TextView; @@ -12,13 +17,20 @@ import com.codeest.geeknews.presenter.WelcomePresenter; import com.codeest.geeknews.presenter.contract.WelcomeContract; +import java.util.List; + import butterknife.BindView; +import pub.devrel.easypermissions.AfterPermissionGranted; +import pub.devrel.easypermissions.AppSettingsDialog; +import pub.devrel.easypermissions.EasyPermissions; + +import static pub.devrel.easypermissions.AppSettingsDialog.DEFAULT_SETTINGS_REQ_CODE; /** * Created by codeest on 16/8/15. */ -public class WelcomeActivity extends BaseActivity implements WelcomeContract.View { +public class WelcomeActivity extends BaseActivity implements WelcomeContract.View, EasyPermissions.PermissionCallbacks { @BindView(R.id.iv_welcome_bg) ImageView ivWelcomeBg; @@ -49,6 +61,22 @@ public void showContent(WelcomeBean welcomeBean) { @Override public void jumpToMain() { + requirePermissions(); + } + + @Override + protected void onDestroy() { + Glide.clear(ivWelcomeBg); + super.onDestroy(); + } + + @Override + public void showError(String msg) { + + } + + + private void toMain() { Intent intent = new Intent(); intent.setClass(this,MainActivity.class); startActivity(intent); @@ -56,14 +84,76 @@ public void jumpToMain() { overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); } + + private static final int RC_PERMISSIONS = 123; + + @SuppressLint("InlinedApi") + private boolean hasPermissions() { + return EasyPermissions.hasPermissions(this, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE); + } + + + @SuppressLint("InlinedApi") + @AfterPermissionGranted(RC_PERMISSIONS) + private void requirePermissions() { + if (hasPermissions()) { + toMain(); + } else { + // Ask for one permission + EasyPermissions.requestPermissions(this, + getString(R.string.rationale_permissions), + RC_PERMISSIONS, + Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.READ_PHONE_STATE); + } + } + + @Override - protected void onDestroy() { - Glide.clear(ivWelcomeBg); - super.onDestroy(); + public void onPermissionsGranted(int requestCode, List perms) { + toMain(); } + @Override - public void showError(String msg) { + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this); + } + + + @Override + public void onPermissionsDenied(int requestCode, List perms) { + permissionsDeniedOpenSetting(); + } + + private void permissionsDeniedOpenSetting() { + if (!hasPermissions()) { + new AppSettingsDialog.Builder(this, getString(R.string.app_settings_dialog_rationale_ask_again)).setTitle(getString(R.string.app_settings_dialog_title_settings_dialog)) + .setPositiveButton(getString(R.string.app_settings_dialog_setting)) + .setNegativeButton(getString(R.string.app_settings_dialog_cancel), + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + ActivityCompat.finishAffinity(WelcomeActivity.this); + } + }) + .build() + .show(); + } + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + switch (requestCode) { + case DEFAULT_SETTINGS_REQ_CODE: + if (hasPermissions()) { + toMain(); + } + permissionsDeniedOpenSetting(); + break; + } + super.onActivityResult(requestCode, resultCode, data); } } diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/CalendarActivity.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/CalendarActivity.java index 7c57eec..a5002de 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/CalendarActivity.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/CalendarActivity.java @@ -1,6 +1,7 @@ package com.codeest.geeknews.ui.zhihu.activity; import android.support.annotation.NonNull; +import android.support.v4.app.ActivityCompat; import android.support.v7.widget.Toolbar; import com.codeest.geeknews.R; @@ -54,6 +55,6 @@ public void onDateSelected(@NonNull MaterialCalendarView widget, @NonNull Calend @OnClick(R.id.tv_calender_enter) void chooseDate() { RxBus.getDefault().post(mDate); - finish(); + ActivityCompat.finishAfterTransition(this); } } diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/SectionActivity.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/SectionActivity.java index 3eddd2c..d99b1b7 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/SectionActivity.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/SectionActivity.java @@ -1,7 +1,9 @@ package com.codeest.geeknews.ui.zhihu.activity; -import android.app.ActivityOptions; import android.content.Intent; +import android.support.v4.app.ActivityCompat; +import android.support.v4.app.ActivityOptionsCompat; +import android.support.v4.view.ViewCompat; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -43,6 +45,8 @@ public class SectionActivity extends BaseActivity impleme int id; String title; + private int position = -1; + @Override protected void initInject() { getActivityComponent().inject(this); @@ -74,14 +78,16 @@ public void onRefresh() { public void OnItemClick(int position, View shareView) { mPresenter.insertReadToDB(mList.get(position).getId()); mAdapter.setReadState(position, true); - mAdapter.notifyItemChanged(position); + SectionActivity.this.position = position; Intent intent = new Intent(); intent.setClass(mContext, ZhihuDetailActivity.class); intent.putExtra("id", mList.get(position).getId()); + String transitionSharedItemName = ViewCompat.getTransitionName(shareView); + intent.putExtra("shared-item-name", transitionSharedItemName); if (shareView != null) { - mContext.startActivity(intent, ActivityOptions.makeSceneTransitionAnimation(mContext, shareView, "shareView").toBundle()); + ActivityCompat.startActivity(SectionActivity.this, intent, ActivityOptionsCompat.makeSceneTransitionAnimation(mContext, shareView, transitionSharedItemName).toBundle()); } else { - startActivity(intent, ActivityOptions.makeSceneTransitionAnimation(mContext).toBundle()); + ActivityCompat.startActivity(SectionActivity.this, intent, ActivityOptionsCompat.makeBasic().toBundle()); } } }); @@ -89,6 +95,20 @@ public void OnItemClick(int position, View shareView) { viewLoading.start(); } + @Override + protected void onResume() { + super.onResume(); + if (mAdapter != null && position > 0) { + mAdapter.notifyItemChanged(position); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + position = -1; + } + @Override public void showContent(SectionChildListBean sectionChildListBean) { if(swipeRefresh.isRefreshing()) { diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/ThemeActivity.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/ThemeActivity.java index 3678a04..779b5f6 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/ThemeActivity.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/ThemeActivity.java @@ -1,7 +1,9 @@ package com.codeest.geeknews.ui.zhihu.activity; -import android.app.ActivityOptions; import android.content.Intent; +import android.support.v4.app.ActivityCompat; +import android.support.v4.app.ActivityOptionsCompat; +import android.support.v4.view.ViewCompat; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -42,6 +44,8 @@ public class ThemeActivity extends BaseActivity implements int id; + private int position = -1; + @Override protected void initInject() { getActivityComponent().inject(this); @@ -67,14 +71,16 @@ protected void initEventAndData() { public void onItemClick(int position, View shareView) { mPresenter.insertReadToDB(mList.get(position).getId()); mAdapter.setReadState(position, true); - mAdapter.notifyItemChanged(position); + ThemeActivity.this.position = position; Intent intent = new Intent(); intent.setClass(mContext, ZhihuDetailActivity.class); intent.putExtra("id", mList.get(position).getId()); if (shareView != null) { - mContext.startActivity(intent, ActivityOptions.makeSceneTransitionAnimation(mContext, shareView, "shareView").toBundle()); + String transitionSharedItemName = ViewCompat.getTransitionName(shareView); + intent.putExtra("shared-item-name", transitionSharedItemName); + ActivityCompat.startActivity(ThemeActivity.this,intent, ActivityOptionsCompat.makeSceneTransitionAnimation(mContext, shareView, transitionSharedItemName).toBundle()); } else { - startActivity(intent, ActivityOptions.makeSceneTransitionAnimation(mContext).toBundle()); + ActivityCompat.startActivity(ThemeActivity.this, intent, ActivityOptionsCompat.makeBasic().toBundle()); } } }); @@ -97,6 +103,20 @@ public void onRefresh() { }); } + @Override + protected void onResume() { + super.onResume(); + if (mAdapter != null && position > 0) { + mAdapter.notifyItemChanged(position); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + position = -1; + } + @Override public void showError(String msg) { if(swipeRefresh.isRefreshing()) { diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/ZhihuDetailActivity.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/ZhihuDetailActivity.java index dfaff4b..40c2259 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/ZhihuDetailActivity.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/ZhihuDetailActivity.java @@ -1,7 +1,11 @@ package com.codeest.geeknews.ui.zhihu.activity; +import android.annotation.SuppressLint; import android.content.Intent; +import android.support.design.widget.AppBarLayout; import android.support.design.widget.FloatingActionButton; +import android.support.v4.app.ActivityCompat; +import android.support.v4.view.ViewCompat; import android.support.v4.widget.NestedScrollView; import android.support.v7.widget.Toolbar; import android.transition.Transition; @@ -62,6 +66,8 @@ public class ZhihuDetailActivity extends BaseActivity impl FrameLayout llDetailBottom; @BindView(R.id.fab_like) FloatingActionButton fabLike; + @BindView(R.id.app_bar) + AppBarLayout appBar; int id = 0; int allNum = 0; @@ -83,10 +89,12 @@ protected int getLayout() { return R.layout.activity_zhihu_detail; } + @SuppressLint("SetJavaScriptEnabled") @Override protected void initEventAndData() { - setToolBar(viewToolbar,""); Intent intent = getIntent(); + setToolBar(viewToolbar,""); + ViewCompat.setTransitionName(appBar, intent.getExtras().getString("shared-item-name")); id = intent.getExtras().getInt("id"); mPresenter.queryLikeData(id); mPresenter.getDetailData(id); @@ -233,7 +241,7 @@ public void onBackPressedSupport() { if (getSupportFragmentManager().getBackStackEntryCount() > 1) { pop(); } else { - finishAfterTransition(); + ActivityCompat.finishAfterTransition(this); } } } diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/DailyAdapter.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/DailyAdapter.java index c5c32a1..56abf56 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/DailyAdapter.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/DailyAdapter.java @@ -2,6 +2,7 @@ import android.content.Context; import android.support.v4.content.ContextCompat; +import android.support.v4.view.ViewCompat; import android.support.v4.view.ViewPager; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -12,6 +13,7 @@ import android.widget.TextView; import com.codeest.geeknews.R; +import com.codeest.geeknews.app.App; import com.codeest.geeknews.component.ImageLoader; import com.codeest.geeknews.model.bean.DailyBeforeListBean; import com.codeest.geeknews.model.bean.DailyListBean; @@ -87,7 +89,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType } @Override - public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { + public void onBindViewHolder( RecyclerView.ViewHolder holder, int position) { if (holder instanceof ContentViewHolder) { final int contentPosition; if(isBefore) { @@ -95,18 +97,23 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { } else { contentPosition = position - 2; } - ((ContentViewHolder)holder).title.setText(mList.get(contentPosition).getTitle()); - if (mList.get(contentPosition).getReadState()) { + final DailyListBean.StoriesBean listItem = mList.get(contentPosition); + ((ContentViewHolder)holder).title.setText(listItem + .getTitle()); + if (listItem + .getReadState()) { ((ContentViewHolder)holder).title.setTextColor(ContextCompat.getColor(mContext,R.color.news_read)); } else { ((ContentViewHolder)holder).title.setTextColor(ContextCompat.getColor(mContext,R.color.news_unread)); } - ImageLoader.load(mContext,mList.get(contentPosition).getImages().get(0),((ContentViewHolder)holder).image); + final String url = listItem.getImages().get(0); + ImageLoader.load(mContext,url, ((ContentViewHolder)holder).image); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { if(onItemClickListener != null) { ImageView iv = (ImageView) view.findViewById(R.id.iv_daily_item_image); + ViewCompat.setTransitionName(iv, App.getInstance().getString(R.string.transition_share_item_name) + "-" + url); onItemClickListener.onItemClick(contentPosition,iv); } } diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/HotAdapter.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/HotAdapter.java index 2e4688c..961e3ef 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/HotAdapter.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/HotAdapter.java @@ -2,6 +2,7 @@ import android.content.Context; import android.support.v4.content.ContextCompat; +import android.support.v4.view.ViewCompat; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; @@ -10,6 +11,7 @@ import android.widget.TextView; import com.codeest.geeknews.R; +import com.codeest.geeknews.app.App; import com.codeest.geeknews.component.ImageLoader; import com.codeest.geeknews.model.bean.HotListBean; import com.codeest.geeknews.widget.SquareImageView; @@ -48,18 +50,24 @@ public int getItemCount() { @Override public void onBindViewHolder(final ViewHolder holder, int position) { - holder.title.setText(mList.get(position).getTitle()); - if (mList.get(position).getReadState()) { + final HotListBean.RecentBean listItem = mList.get(position); + holder.title.setText(listItem + .getTitle()); + if (listItem + .getReadState()) { holder.title.setTextColor(ContextCompat.getColor(mContext,R.color.news_read)); } else { holder.title.setTextColor(ContextCompat.getColor(mContext,R.color.news_unread)); } - ImageLoader.load(mContext,mList.get(position).getThumbnail(),holder.image); + final String url = listItem + .getThumbnail(); + ImageLoader.load(mContext, url, holder.image); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { if(onItemClickListener != null) { ImageView iv = (ImageView) view.findViewById(R.id.iv_daily_item_image); + ViewCompat.setTransitionName(iv, App.getInstance().getString(R.string.transition_share_item_name) + "-" + url); onItemClickListener.onItemClick(holder.getAdapterPosition(),iv); } } diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/SectionChildAdapter.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/SectionChildAdapter.java index 168edb4..b087e72 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/SectionChildAdapter.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/SectionChildAdapter.java @@ -2,15 +2,15 @@ import android.content.Context; import android.support.v4.content.ContextCompat; -import android.support.v7.view.menu.ExpandedMenuView; +import android.support.v4.view.ViewCompat; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; import android.widget.TextView; import com.codeest.geeknews.R; +import com.codeest.geeknews.app.App; import com.codeest.geeknews.component.ImageLoader; import com.codeest.geeknews.model.bean.SectionChildListBean; import com.codeest.geeknews.widget.SquareImageView; @@ -44,24 +44,32 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { @Override public void onBindViewHolder(final ViewHolder holder, int position) { - if (mList.get(position).getImages() != null && mList.get(position).getImages().size() > 0) { + final SectionChildListBean.StoriesBean listItem = mList.get(position); + final StringBuilder url = new StringBuilder(""); + if (listItem.getImages() != null && listItem.getImages() + .size() > 0) { holder.ivImage.setVisibility(View.VISIBLE); - ImageLoader.load(mContext,mList.get(position).getImages().get(0),holder.ivImage); + url.append(listItem.getImages() + .get(0)); + ImageLoader.load(mContext, url.toString(), holder.ivImage); } else { holder.ivImage.setVisibility(View.GONE); } - if (mList.get(position).getReadState()) { - holder.tvTitle.setTextColor(ContextCompat.getColor(mContext,R.color.news_read)); + if (listItem.getReadState()) { + holder.tvTitle.setTextColor(ContextCompat.getColor(mContext, R.color.news_read)); } else { - holder.tvTitle.setTextColor(ContextCompat.getColor(mContext,R.color.news_unread)); + holder.tvTitle.setTextColor(ContextCompat.getColor(mContext, R.color.news_unread)); } - holder.tvTitle.setText(mList.get(position).getTitle()); + holder.tvTitle.setText(listItem.getTitle()); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if(onItemClickListener != null) { + if (onItemClickListener != null) { SquareImageView iv = (SquareImageView) view.findViewById(R.id.iv_daily_item_image); - onItemClickListener.OnItemClick(holder.getAdapterPosition(),iv); + ViewCompat.setTransitionName(iv, + App.getInstance() + .getString(R.string.transition_share_item_name) + "-" + url); + onItemClickListener.OnItemClick(holder.getAdapterPosition(), iv); } } }); diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/ThemeChildAdapter.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/ThemeChildAdapter.java index 9f8bdf0..81d075f 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/ThemeChildAdapter.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/ThemeChildAdapter.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.Bitmap; +import android.support.v4.view.ViewCompat; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; @@ -13,6 +14,7 @@ import com.bumptech.glide.request.animation.GlideAnimation; import com.bumptech.glide.request.target.SimpleTarget; import com.codeest.geeknews.R; +import com.codeest.geeknews.app.App; import com.codeest.geeknews.component.ImageLoader; import com.codeest.geeknews.model.bean.ThemeChildListBean; import com.codeest.geeknews.util.ImageUtil; @@ -69,33 +71,44 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType @Override public void onBindViewHolder(final RecyclerView.ViewHolder holder, int position) { - if(holder instanceof ViewHolder) { - if (mList.get(position).getImages() != null && mList.get(position).getImages().size() > 0) { - ImageLoader.load(mContext,mList.get(position).getImages().get(0),((ViewHolder) holder).image); + if (holder instanceof ViewHolder) { + final ThemeChildListBean.StoriesBean listItem = mList.get(position); + final StringBuilder url = new StringBuilder(""); + if (listItem.getImages() != null && listItem.getImages() + .size() > 0) { + url.append(listItem.getImages() + .get(0)); + ImageLoader.load(mContext, url.toString(), ((ViewHolder) holder).image); } - ((ViewHolder) holder).title.setText(mList.get(position).getTitle()); + ((ViewHolder) holder).title.setText(listItem.getTitle()); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if(onItemClickListener != null) { + if (onItemClickListener != null) { SquareImageView iv = (SquareImageView) view.findViewById(R.id.iv_daily_item_image); - onItemClickListener.onItemClick(holder.getAdapterPosition(),iv); + ViewCompat.setTransitionName(iv, + App.getInstance() + .getString(R.string.transition_share_item_name) + "-" + url); + onItemClickListener.onItemClick(holder.getAdapterPosition(), iv); } } }); - } else if(holder instanceof TopViewHolder) { + } else if (holder instanceof TopViewHolder) { if (url != null) { - ImageLoader.load(mContext, url, ((TopViewHolder)holder).ivOrigin); - ivOrigin = ((TopViewHolder)holder).ivOrigin; - Glide.with(mContext).load(url).asBitmap().into(new SimpleTarget() { - @Override - public void onResourceReady(Bitmap resource, GlideAnimation glideAnimation) { - ((TopViewHolder)holder).ivBlur.setImageBitmap(ImageUtil.doBlur(resource, 50 , true)); - } - }); + ImageLoader.load(mContext, url, ((TopViewHolder) holder).ivOrigin); + ivOrigin = ((TopViewHolder) holder).ivOrigin; + Glide.with(mContext) + .load(url) + .asBitmap() + .into(new SimpleTarget() { + @Override + public void onResourceReady(Bitmap resource, GlideAnimation glideAnimation) { + ((TopViewHolder) holder).ivBlur.setImageBitmap(ImageUtil.doBlur(resource, 50, true)); + } + }); } if (des != null) { - ((TopViewHolder)holder).tvDes.setText(des); + ((TopViewHolder) holder).tvDes.setText(des); } } } diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/DailyFragment.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/DailyFragment.java index 9360b6f..aea7ff8 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/DailyFragment.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/DailyFragment.java @@ -1,8 +1,10 @@ package com.codeest.geeknews.ui.zhihu.fragment; -import android.app.ActivityOptions; import android.content.Intent; import android.support.design.widget.FloatingActionButton; +import android.support.v4.app.ActivityCompat; +import android.support.v4.app.ActivityOptionsCompat; +import android.support.v4.view.ViewCompat; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -48,6 +50,8 @@ public class DailyFragment extends BaseFragment implements Daily DailyAdapter mAdapter; List mList = new ArrayList<>(); + private int position = -1; + @Override protected void initInject() { getFragmentComponent().inject(this); @@ -67,16 +71,14 @@ protected void initEventAndData() { public void onItemClick(int position,View shareView) { mPresenter.insertReadToDB(mList.get(position).getId()); mAdapter.setReadState(position,true); - if(mAdapter.getIsBefore()) { - mAdapter.notifyItemChanged(position + 1); - } else { - mAdapter.notifyItemChanged(position + 2); - } + DailyFragment.this.position = position; Intent intent = new Intent(); intent.setClass(mContext, ZhihuDetailActivity.class); intent.putExtra("id",mList.get(position).getId()); - ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(mActivity, shareView, "shareView"); - mContext.startActivity(intent,options.toBundle()); + String transitionSharedItemName = ViewCompat.getTransitionName(shareView); + intent.putExtra("shared-item-name", transitionSharedItemName); + ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(mActivity, shareView, transitionSharedItemName); + ActivityCompat.startActivity(mActivity, intent, options.toBundle()); } }); swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @@ -99,6 +101,25 @@ public void onRefresh() { mPresenter.getDailyData(); } + @Override + public void onResume() { + super.onResume(); + if (mAdapter == null || position < 0) { + return; + } + if (mAdapter.getIsBefore()) { + mAdapter.notifyItemChanged(position + 1); + } else { + mAdapter.notifyItemChanged(position + 2); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + position = -1; + } + /** * 当天数据 * @param info diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/HotFragment.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/HotFragment.java index f53884d..b151a19 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/HotFragment.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/HotFragment.java @@ -1,7 +1,9 @@ package com.codeest.geeknews.ui.zhihu.fragment; -import android.app.ActivityOptions; import android.content.Intent; +import android.support.v4.app.ActivityCompat; +import android.support.v4.app.ActivityOptionsCompat; +import android.support.v4.view.ViewCompat; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -15,7 +17,6 @@ import com.codeest.geeknews.ui.zhihu.activity.ZhihuDetailActivity; import com.codeest.geeknews.ui.zhihu.adapter.HotAdapter; import com.codeest.geeknews.util.SnackbarUtil; -import com.codeest.geeknews.util.ToastUtil; import com.victor.loading.rotate.RotateLoading; import java.util.ArrayList; @@ -38,6 +39,8 @@ public class HotFragment extends BaseFragment implements HotContra List mList; HotAdapter mAdapter; + private int position = -1; + @Override protected void initInject() { getFragmentComponent().inject(this); @@ -68,16 +71,32 @@ public void onRefresh() { public void onItemClick(int position, View shareView) { mPresenter.insertReadToDB(mList.get(position).getNews_id()); mAdapter.setReadState(position,true); - mAdapter.notifyItemChanged(position); + HotFragment.this.position = position; Intent intent = new Intent(); intent.setClass(mContext, ZhihuDetailActivity.class); intent.putExtra("id",mList.get(position).getNews_id()); - ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(mActivity, shareView, "shareView"); - mContext.startActivity(intent,options.toBundle()); + String transitionSharedItemName = ViewCompat.getTransitionName(shareView); + intent.putExtra("shared-item-name", transitionSharedItemName); + ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(mActivity, shareView, transitionSharedItemName); + ActivityCompat.startActivity(mActivity, intent, options.toBundle()); } }); } + @Override + public void onResume() { + super.onResume(); + if (mAdapter != null && position > 0) { + mAdapter.notifyItemChanged(position); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + position = -1; + } + @Override public void showError(String msg) { if(swipeRefresh.isRefreshing()) { diff --git a/app/src/main/res/drawable/ic_licenses.xml b/app/src/main/res/drawable/ic_licenses.xml new file mode 100644 index 0000000..5fb1a0a --- /dev/null +++ b/app/src/main/res/drawable/ic_licenses.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/selector_item_background.xml b/app/src/main/res/drawable/selector_item_background.xml new file mode 100644 index 0000000..03633b5 --- /dev/null +++ b/app/src/main/res/drawable/selector_item_background.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_licences.xml b/app/src/main/res/layout/activity_licences.xml new file mode 100644 index 0000000..fc54651 --- /dev/null +++ b/app/src/main/res/layout/activity_licences.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_zhihu_detail.xml b/app/src/main/res/layout/activity_zhihu_detail.xml index e4c4c48..f759149 100644 --- a/app/src/main/res/layout/activity_zhihu_detail.xml +++ b/app/src/main/res/layout/activity_zhihu_detail.xml @@ -9,7 +9,6 @@ android:id="@+id/app_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:transitionName="shareView" android:fitsSystemWindows="true"> + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml index 202b963..6e8a8d8 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -1,17 +1,18 @@ + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/selector_item_background" + android:orientation="horizontal" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingTop="12dp"> + android:layout_height="@dimen/comment_face_size" + android:layout_marginEnd="10dp"/> diff --git a/app/src/main/res/layout/item_tech.xml b/app/src/main/res/layout/item_tech.xml index f508a4e..36f1766 100644 --- a/app/src/main/res/layout/item_tech.xml +++ b/app/src/main/res/layout/item_tech.xml @@ -9,6 +9,7 @@ android:id="@+id/cv_tech_content" android:layout_width="match_parent" android:layout_height="wrap_content" + android:foreground="@drawable/selector_item_background" android:transitionName="shareView" app:cardBackgroundColor="@color/colorCard" app:cardElevation="2dp" diff --git a/app/src/main/res/layout/item_theme.xml b/app/src/main/res/layout/item_theme.xml index ce68c7f..9c63e83 100644 --- a/app/src/main/res/layout/item_theme.xml +++ b/app/src/main/res/layout/item_theme.xml @@ -7,6 +7,7 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/list_licences_item_group.xml b/app/src/main/res/layout/list_licences_item_group.xml new file mode 100644 index 0000000..47e0a33 --- /dev/null +++ b/app/src/main/res/layout/list_licences_item_group.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml index 1e50a6d..0c210e6 100644 --- a/app/src/main/res/menu/drawer_menu.xml +++ b/app/src/main/res/menu/drawer_menu.xml @@ -38,6 +38,12 @@ android:icon="@mipmap/ic_drawer_about" android:checkable="true" android:title="@string/drawer_about"/> + + \ No newline at end of file diff --git a/app/src/main/res/transition/platform_transition.xml b/app/src/main/res/transition/platform_transition.xml new file mode 100644 index 0000000..51d888a --- /dev/null +++ b/app/src/main/res/transition/platform_transition.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a92c42f..668fab5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,6 +6,7 @@ #EEEEEE #FFFFFF #2C2C2C + #80303F9F #FF4081 #6e000000 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 423df34..cbfe494 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -39,4 +39,14 @@ 项目简介:\n极客日报,一个纯粹的阅读App\n为了熟悉当前Android端主流框架的使用,也为了能有一款将新闻、技术文章、福利一网打尽的简洁的阅读应用,利用闲暇时间做了这个项目n(*≧▽≦*)n\n 本着学习的目的,该项目会持续迭代与优化,加入更丰富的阅读内容与功能,并不断尝试最新的技术,欢迎star、fork、issue、email GeekNews\t\t\tV1.0.1 + shareView + + 本应用会访问您的外部存储以用来保存一些文件或图片及相关信息, 及设备的状态信息。 + 本应用真心需要一些特别权限来完成任务，请开放这些必须的权限。 + 权限需求 + 设置 + 离开应用 + + 开放软件证书 + 总计%1$d份证书, %2$d外部库，软件。 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 73017f6..cee953b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -8,12 +8,22 @@ @color/colorAccent #ffffff - //沉浸状态栏 + true true - //ActionBarDrawerToggle设置颜色 + @android:color/white + + + true + + @transition/platform_transition + + @transition/platform_transition + true + @android:color/transparent +