diff --git a/README.md b/README.md index 2259f2595..75c212002 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ You can find anything you search for in the wiki. (If not open an issue) The AboutLibraries Library is pushed to [Maven Central](http://search.maven.org/#search|ga|1|g%3A%22com.mikepenz%22), so you just need to add the following dependency to your `build.gradle`. It seems it is also required to add the support dependencies to the application. If it works without, you should be fine too :). ```javascript -compile('com.mikepenz:aboutlibraries:5.2.1@aar') { +compile('com.mikepenz:aboutlibraries:5.2.2@aar') { transitive = true } ``` @@ -98,6 +98,15 @@ or use the builder and add following: ``` +##ProGuard +Exclude `R` from ProGuard to enable the library auto detection +```proguard +-keep class .R +-keep class .R$* { + ; +} +``` + ##Contribute You can contribute by creating a information file for a new library, and open a pull-request at the creators Git repository. If he doesn't include the information file in his repo, or if the library isn't maintained anymore you can create a pull-request here. Find more information in the wiki [Create a definition file](https://github.com/mikepenz/AboutLibraries/wiki/HOWTODEV:-Include-into-AboutLibraries) @@ -105,15 +114,16 @@ You can contribute by creating a information file for a new library, and open a ##Already in use in following apps (feel free to send me new projects) +* [wallsplash](https://play.google.com/store/apps/details?id=com.mikepenz.unsplash) * [Numbers](https://play.google.com/store/apps/details?id=com.tundem.numbersreloaded.free) * [MegaYatzy](https://play.google.com/store/apps/details?id=com.tundem.yatzyTJ) - * [Sir Spellalot](https://play.google.com/store/apps/details?id=com.sirspellalot.app.android) * [TVShow Time](https://play.google.com/store/apps/details?id=com.tozelabs.tvshowtime) * [Strength](https://play.google.com/store/apps/details?id=com.e13engineering.strength) * [Sprit Club](https://play.google.com/store/apps/details?id=at.idev.spritpreise) * [Hold'Em Poker Manager](https://play.google.com/store/apps/details?id=pt.massena.holdemtracker.free) * [PixCell8](https://play.google.com/store/apps/details?id=com.pixcell8.prod) +* [ML Manager](https://play.google.com/store/apps/details?id=com.javiersantos.mlmanager) #Developed By diff --git a/build.gradle b/build.gradle index 923774520..c29799175 100755 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:1.3.1' } } @@ -17,5 +17,5 @@ allprojects { } task wrapper(type: Wrapper) { - gradleVersion = '2.5' + gradleVersion = '2.6' } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 1e46f5daf..a57d9f346 100755 --- a/gradle.properties +++ b/gradle.properties @@ -17,8 +17,8 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -VERSION_NAME=5.2.1 -VERSION_CODE=521 +VERSION_NAME=5.2.2 +VERSION_CODE=522 GROUP=com.mikepenz POM_DESCRIPTION=AboutLibraries Library diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c49777a52..460d48a78 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Dec 18 23:09:33 CET 2014 +#Tue Sep 01 19:53:29 CEST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip diff --git a/library/build.gradle b/library/build.gradle index 4299ba8a3..2bb350720 100755 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.library' android { compileSdkVersion 23 - buildToolsVersion '23' + buildToolsVersion '23.0.1' defaultConfig { minSdkVersion 10 targetSdkVersion 23 - versionCode 521 - versionName '5.2.1' + versionCode 522 + versionName '5.2.2' } buildTypes { @@ -26,8 +26,7 @@ android { apply from: 'gradle-mvn-push.gradle' dependencies { - compile 'com.android.support:support-v4:23.0.0' - compile 'com.android.support:appcompat-v7:23.0.0' - compile 'com.android.support:cardview-v7:23.0.0' - compile 'com.android.support:recyclerview-v7:23.0.0' + compile 'com.android.support:appcompat-v7:23.0.1' + compile 'com.android.support:cardview-v7:23.0.1' + compile 'com.android.support:recyclerview-v7:23.0.1' } diff --git a/library/src/main/res/values/library_aboutlibraries_strings.xml b/library/src/main/res/values/library_aboutlibraries_strings.xml index a00bb40ef..a45b3e672 100755 --- a/library/src/main/res/values/library_aboutlibraries_strings.xml +++ b/library/src/main/res/values/library_aboutlibraries_strings.xml @@ -12,7 +12,7 @@ Most modern apps feature an "Used Library"-Section and for this some information of those libs is required. As it gets annoying to copy those strings always to your app I have developed this small helper library to provide the required information. ]]> - 5.2.1 + 5.2.2 https://github.com/mikepenz/AboutLibraries apache_2_0 true diff --git a/library/src/main/res/values/library_ddplist_strings.xml b/library/src/main/res/values/library_ddplist_strings.xml new file mode 100644 index 000000000..67f6cc8a0 --- /dev/null +++ b/library/src/main/res/values/library_ddplist_strings.xml @@ -0,0 +1,23 @@ + + + year;owner + Daniel Dreibrodt + dd-plist + +
+ Property lists are files used to store user settings and serialized objects. They originate from the NeXSTEP programming environment and are now a basic part of the Cocoa framework (OS X and iOS) as well as the GNUstep framework. + ]]> + + 1.3 + https://groups.google.com/forum/#!forum/plist-discuss + mit + true + https://github.com/3breadt/dd-plist + com.dd.plist.NSNumber + + Daniel Dreibrodt + 2015 + + diff --git a/library/src/main/res/values/library_encryption_strings.xml b/library/src/main/res/values/library_encryption_strings.xml new file mode 100644 index 000000000..bb46ac4b5 --- /dev/null +++ b/library/src/main/res/values/library_encryption_strings.xml @@ -0,0 +1,17 @@ + + + year;owner + simbiose + Encryption + Encryption is a simple way to create encrypted strings to Android project. + 1.2.0 + https://github.com/simbiose/Encryption + lgpl_3_0 + true + https://github.com/simbiose/Encryption + se.simbio.encryption.Encryption + + simbiose + 2015 + + diff --git a/library/src/main/res/values/library_intellijannotations_strings.xml b/library/src/main/res/values/library_intellijannotations_strings.xml new file mode 100644 index 000000000..c891f1126 --- /dev/null +++ b/library/src/main/res/values/library_intellijannotations_strings.xml @@ -0,0 +1,16 @@ + + + year;owner + Jetbrain developers + IntelliJ IDEA Annotations + A set of annotations used for code inspection support and code documentation. + 12.0.0 + http://www.jetbrains.org + apache_2_0 + false + org.jetbrains.annotations.Nullable + + Jetbrain developers + 2015 + + diff --git a/library/src/main/res/values/license_lgpl_3_0_strings.xml b/library/src/main/res/values/license_lgpl_3_0_strings.xml new file mode 100755 index 000000000..d79bd2f31 --- /dev/null +++ b/library/src/main/res/values/license_lgpl_3_0_strings.xml @@ -0,0 +1,146 @@ + + + + + GNU LESSER GENERAL PUBLIC LICENSE 3.0 + http://www.gnu.org/licenses/lgpl-3.0.en.html + + +
+Version 3, 29 June 2007
+
+Copyright © 2007 Free Software Foundation, Inc.
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. +0. Additional Definitions.
+
+As used herein, “this License” refers to version 3 of the GNU Lesser General Public License, and the “GNU GPL” refers to version 3 of the GNU General Public License.
+
+“The Library” refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.
+
+An “Application” is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.
+
+A “Combined Work” is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the “Linked Version”.
+
+The “Minimal Corresponding Source” for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.
+
+The “Corresponding Application Code” for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.
+1. Exception to Section 3 of the GNU GPL.
+
+You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.
+2. Conveying Modified Versions.
+
+If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:
+
+ a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or
+ b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.
+
+3. Object Code Incorporating Material from Library Header Files.
+
+The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.
+ b) Accompany the object code with a copy of the GNU GPL and this license document.

+
+4. Combined Works.
+
+You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:
+
+ a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license document.
+ c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.
+ d) Do one of the following:
+ 0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
+ 1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user\'s computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.
+ e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)
+
+5. Combined Libraries.
+
+You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:
+ + a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.
+ b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
+
+6. Revised Versions of the GNU Lesser General Public License.
+
+The Free Software Foundation may publish revised and/or new versions of the GNU Lesser 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 Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.
+
+If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy\'s public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.
+ ]]> + + + +
+Version 3, 29 June 2007
+
+Copyright © 2007 Free Software Foundation, Inc.
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. +0. Additional Definitions.
+
+As used herein, “this License” refers to version 3 of the GNU Lesser General Public License, and the “GNU GPL” refers to version 3 of the GNU General Public License.
+
+“The Library” refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.
+
+An “Application” is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.
+
+A “Combined Work” is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the “Linked Version”.
+
+The “Minimal Corresponding Source” for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.
+
+The “Corresponding Application Code” for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.
+1. Exception to Section 3 of the GNU GPL.
+
+You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.
+2. Conveying Modified Versions.
+
+If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:
+
+ a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or
+ b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.
+
+3. Object Code Incorporating Material from Library Header Files.
+
+The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.
+ b) Accompany the object code with a copy of the GNU GPL and this license document.

+
+4. Combined Works.
+
+You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:
+
+ a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license document.
+ c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.
+ d) Do one of the following:
+ 0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
+ 1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user\'s computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.
+ e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)
+
+5. Combined Libraries.
+
+You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:
+ + a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.
+ b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
+
+6. Revised Versions of the GNU Lesser General Public License.
+
+The Free Software Foundation may publish revised and/or new versions of the GNU Lesser 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 Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.
+
+If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy\'s public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.
+ ]]> + + + diff --git a/sample/build.gradle b/sample/build.gradle index 4d4805c26..fc093ec46 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -8,13 +8,13 @@ try { android { compileSdkVersion 23 - buildToolsVersion '23' + buildToolsVersion '23.0.1' defaultConfig { applicationId 'com.mikepenz.aboutlibraries.sample' minSdkVersion 11 targetSdkVersion 23 - versionCode 521 - versionName '5.2.1' + versionCode 522 + versionName '5.2.2' applicationVariants.all { variant -> variant.outputs.each { output -> @@ -56,7 +56,7 @@ dependencies { compile 'com.fima.cardsui:library:1.+@aar' compile project(':library') - compile('com.mikepenz:materialdrawer:3.1.2@aar') { + compile('com.mikepenz:materialdrawer:4.0.5@aar') { transitive = true } } diff --git a/sample/src/main/java/com/mikepenz/aboutlibraries/sample/FragmentActivity.java b/sample/src/main/java/com/mikepenz/aboutlibraries/sample/FragmentActivity.java index 986aeb0a7..21321ef18 100644 --- a/sample/src/main/java/com/mikepenz/aboutlibraries/sample/FragmentActivity.java +++ b/sample/src/main/java/com/mikepenz/aboutlibraries/sample/FragmentActivity.java @@ -7,7 +7,6 @@ import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.View; -import android.widget.AdapterView; import android.widget.Toast; import com.mikepenz.aboutlibraries.Libs; @@ -38,15 +37,15 @@ public void onCreate(Bundle savedInstanceState) { .withToolbar(toolbar) .addDrawerItems( new PrimaryDrawerItem().withName("Home"), - new PrimaryDrawerItem().withName(R.string.action_manifestactivity).withIdentifier(R.id.action_manifestactivity).withCheckable(false), - new PrimaryDrawerItem().withName(R.string.action_extendactivity).withIdentifier(R.id.action_extendactivity).withCheckable(false), - new PrimaryDrawerItem().withName(R.string.action_customsortactivity).withIdentifier(R.id.action_customsortactivity).withCheckable(false), - new PrimaryDrawerItem().withName(R.string.action_customactivity).withIdentifier(R.id.action_customactivity).withCheckable(false), - new PrimaryDrawerItem().withName(R.string.action_opensource).withIdentifier(R.id.action_opensource).withCheckable(false) + new PrimaryDrawerItem().withName(R.string.action_manifestactivity).withIdentifier(R.id.action_manifestactivity).withSelectable(false), + new PrimaryDrawerItem().withName(R.string.action_extendactivity).withIdentifier(R.id.action_extendactivity).withSelectable(false), + new PrimaryDrawerItem().withName(R.string.action_customsortactivity).withIdentifier(R.id.action_customsortactivity).withSelectable(false), + new PrimaryDrawerItem().withName(R.string.action_customactivity).withIdentifier(R.id.action_customactivity).withSelectable(false), + new PrimaryDrawerItem().withName(R.string.action_opensource).withIdentifier(R.id.action_opensource).withSelectable(false) ) .withOnDrawerItemClickListener(new Drawer.OnDrawerItemClickListener() { @Override - public boolean onItemClick(AdapterView adapterView, View view, int i, long l, IDrawerItem drawerItem) { + public boolean onItemClick(View view, int i, IDrawerItem drawerItem) { // Handle action bar item clicks here. The action bar will // automatically handle clicks on the Home/Up button, so long // as you specify a parent activity in AndroidManifest.xml.