Merge branch 'release/v5.0.7'

mikepenz · Jul 11, 2015 · 6f67417 · 6f67417
2 parents cc1e3c4 + 414484d
commit 6f67417
Show file tree

Hide file tree

Showing 11 changed files with 94 additions and 31 deletions.
diff --git 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.0.6@aar') {
+compile('com.mikepenz:aboutlibraries:5.0.7@aar') {
 	transitive = true
 }
 ```
@@ -126,6 +126,7 @@ You can contribute by creating a information file for a new library, and open a
 * [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)
 
 
 #Developed By

diff --git 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.0.6
-VERSION_CODE=506
+VERSION_NAME=5.0.7
+VERSION_CODE=507
 GROUP=com.mikepenz
 
 POM_DESCRIPTION=AboutLibraries Library

diff --git a/library/build.gradle b/library/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 10
         targetSdkVersion 22
-        versionCode 506
-        versionName '5.0.6'
+        versionCode 507
+        versionName '5.0.7'
     }
 
     buildTypes {

diff --git a/library/src/main/java/com/mikepenz/aboutlibraries/LibsConfiguration.java b/library/src/main/java/com/mikepenz/aboutlibraries/LibsConfiguration.java
@@ -1,6 +1,7 @@
 package com.mikepenz.aboutlibraries;
 
 import android.view.View;
+import android.view.animation.LayoutAnimationController;
 
 import com.mikepenz.aboutlibraries.entity.Library;
 
@@ -26,7 +27,6 @@ public static LibsConfiguration getInstance() {
      * LOGIC FOR THE LISTENER
      */
     private LibsListener listener = null;
-    private LibsUIListener uiListener = null;
 
     public void setListener(LibsListener libsListener) {
         this.listener = libsListener;
@@ -40,6 +40,9 @@ public void removeListener() {
         this.listener = null;
     }
 
+
+    private LibsUIListener uiListener = null;
+
     public LibsUIListener getUiListener() {
         return uiListener;
     }
@@ -52,6 +55,17 @@ public void removeUiListener() {
         this.uiListener = null;
     }
 
+
+    private LayoutAnimationController layoutAnimationController = null;
+
+    public LayoutAnimationController getLayoutAnimationController() {
+        return layoutAnimationController;
+    }
+
+    public void setLayoutAnimationController(LayoutAnimationController layoutAnimationController) {
+        this.layoutAnimationController = layoutAnimationController;
+    }
+
     /**
      * helper to reset a current configuration
      * is only useful for the sample app

diff --git a/library/src/main/java/com/mikepenz/aboutlibraries/ui/LibsFragment.java b/library/src/main/java/com/mikepenz/aboutlibraries/ui/LibsFragment.java
@@ -113,8 +113,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         }
 
         // init CardView
-        mRecyclerView = (RecyclerView) view.findViewById(R.id.cardListView);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(LibsFragment.this.getActivity()));
+        if (view.getId() == R.id.cardListView) {
+            mRecyclerView = (RecyclerView) view;
+        } else {
+            mRecyclerView = (RecyclerView) view.findViewById(R.id.cardListView);
+        }
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         mRecyclerView.setItemAnimator(new DefaultItemAnimator());
         mAdapter = new LibsRecyclerViewAdapter(builder);
         mRecyclerView.setAdapter(mAdapter);
@@ -134,9 +138,16 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
         mAdapter.addLibs(libraries);
 
         if (builder.animate) {
-            Animation fadeIn = AnimationUtils.loadAnimation(LibsFragment.this.getActivity(), android.R.anim.slide_in_left);
-            fadeIn.setDuration(500);
-            LayoutAnimationController layoutAnimationController = new LayoutAnimationController(fadeIn);
+            LayoutAnimationController layoutAnimationController;
+
+            if (LibsConfiguration.getInstance().getLayoutAnimationController() == null) {
+                Animation fadeIn = AnimationUtils.loadAnimation(LibsFragment.this.getActivity(), android.R.anim.slide_in_left);
+                fadeIn.setDuration(500);
+                layoutAnimationController = new LayoutAnimationController(fadeIn);
+            } else {
+                layoutAnimationController = LibsConfiguration.getInstance().getLayoutAnimationController();
+            }
+
             mRecyclerView.setLayoutAnimation(layoutAnimationController);
             mRecyclerView.startLayoutAnimation();
         }

diff --git a/library/src/main/res/layout/fragment_opensource.xml b/library/src/main/res/layout/fragment_opensource.xml
@@ -1,18 +1,13 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.RecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/cardListView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/cardListView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:divider="@null"
-        android:paddingBottom="@dimen/activity_vertical_margin"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_horizontal_margin"
-        android:scrollbarStyle="outsideInset"
-        android:scrollbars="vertical" />
-</FrameLayout>
+    android:clipToPadding="false"
+    android:divider="@null"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_horizontal_margin"
+    android:scrollbarStyle="outsideInset"
+    android:scrollbars="vertical" />
diff --git 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.
         ]]>
     </string>
-    <string name="library_AboutLibraries_libraryVersion">5.0.6</string>
+    <string name="library_AboutLibraries_libraryVersion">5.0.7</string>
     <string name="library_AboutLibraries_libraryWebsite">https://github.com/mikepenz/AboutLibraries</string>
     <string name="library_AboutLibraries_licenseId">apache_2_0</string>
     <string name="library_AboutLibraries_isOpenSource">true</string>

diff --git a/library/src/main/res/values/library_adjustableimageview_strings.xml b/library/src/main/res/values/library_adjustableimageview_strings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="define_int_AdjustableImageView"></string>
+    <string name="library_AdjustableImageView_author">Sittiphol Phanvilai</string>
+    <string name="library_AdjustableImageView_authorWebsite">https://github.com/nuuneoi</string>
+    <string name="library_AdjustableImageView_libraryName">AdjustableImageView</string>
+    <string name="library_AdjustableImageView_libraryDescription">An adjustable ImageView for Android</string>
+    <string name="library_AdjustableImageView_libraryVersion">1.0.0</string>
+    <string name="library_AdjustableImageView_libraryWebsite">http://inthecheesefactory.com/blog/correct-imageview-adjustviewbounds-with-adjustable-imageview/en</string>
+    <string name="library_AdjustableImageView_licenseId">apache_2_0</string>
+    <string name="library_AdjustableImageView_isOpenSource">true</string>
+    <string name="library_AdjustableImageView_repositoryLink">https://github.com/nuuneoi/AdjustableImageView</string>
+    <string name="library_AdjustableImageView_classPath">com.inthecheesefactory.thecheeselibrary.widget.AdjustableImageView</string>
+</resources>
diff --git a/library/src/main/res/values/library_circleimageview_strings.xml b/library/src/main/res/values/library_circleimageview_strings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="define_int_CircleImageView"></string>
+    <string name="library_CircleImageView_author">Henning Dodenhof</string>
+    <string name="library_CircleImageView_authorWebsite">https://github.com/hdodenhof</string>
+    <string name="library_CircleImageView_libraryName">CircleImageView</string>
+    <string name="library_CircleImageView_libraryDescription">A circular ImageView for Android</string>
+    <string name="library_CircleImageView_libraryVersion">1.3.0</string>
+    <string name="library_CircleImageView_libraryWebsite">https://github.com/hdodenhof/CircleImageView</string>
+    <string name="library_CircleImageView_licenseId">apache_2_0</string>
+    <string name="library_CircleImageView_isOpenSource">true</string>
+    <string name="library_CircleImageView_repositoryLink">https://github.com/hdodenhof/CircleImageView</string>
+    <string name="library_CircleImageView_classPath">de.hdodenhof.circleimageview.CircleImageView</string>
+</resources>
diff --git a/library/src/main/res/values/library_icepick_strings.xml b/library/src/main/res/values/library_icepick_strings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="define_int_Icepick"></string>
+    <string name="library_Icepick_author">Frankie Sardo</string>
+    <string name="library_Icepick_authorWebsite">https://github.com/frankiesardo</string>
+    <string name="library_Icepick_libraryName">Icepick</string>
+    <string name="library_Icepick_libraryDescription">Android Instance State made easy</string>
+    <string name="library_Icepick_libraryVersion">3.0.2</string>
+    <string name="library_Icepick_libraryWebsite">https://github.com/frankiesardo/icepick</string>
+    <string name="library_Icepick_licenseId">apache_2_0</string>
+    <string name="library_Icepick_isOpenSource">true</string>
+    <string name="library_Icepick_repositoryLink">https://github.com/frankiesardo/icepick</string>
+    <string name="library_Icepick_classPath">icepick.Icepick</string>
+</resources>
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId 'com.mikepenz.aboutlibraries.sample'
         minSdkVersion 11
         targetSdkVersion 22
-        versionCode 506
-        versionName '5.0.6'
+        versionCode 507
+        versionName '5.0.7'
 
         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.0.7@aar') {
+    compile('com.mikepenz:materialdrawer:3.1.2@aar') {
         transitive = true
     }
 }