Merge branch 'release/v5.2.0'

hamsaadev · Apr 11, 2016 · fbb3d65 · fbb3d65
2 parents 56cf945 + fe4dbd2
commit fbb3d65
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 108 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,11 +7,11 @@ android:
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-23.0.2
+    - build-tools-23.0.3
 
     # The SDK version used to compile your project
     - android-23
 
     # Additional components
     - extra-google-m2repository
-    - extra-android-m2repository
+    - extra-android-m2repository
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ You can find some frequently asked questions and other resources in the [WIKI /
 ##1. Provide the gradle dependency
 
 ```gradle
-compile('com.mikepenz:materialdrawer:5.1.9@aar') {
+compile('com.mikepenz:materialdrawer:5.2.0@aar') {
 	transitive = true
 }
 ```

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion 10
         targetSdkVersion 23
-        versionCode 519
-        versionName "5.1.9"
+        versionCode 520
+        versionName "5.2.0"
 
         applicationVariants.all { variant ->
             variant.outputs.each { output ->

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         <activity
             android:name=".DrawerActivity"
             android:label="@string/app_name"
-            android:theme="@style/MaterialDrawerTheme.Light.DarkToolbar.TranslucentStatus">
+            android:theme="@style/MaterialDrawerTheme.Light.DarkToolbar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -31,7 +31,7 @@
             android:theme="@style/MaterialDrawerTheme.ActionBar" />
         <activity
             android:name=".MenuDrawerActivity"
-            android:theme="@style/MaterialDrawerTheme.Light.DarkToolbar.TranslucentStatus" />
+            android:theme="@style/MaterialDrawerTheme.Light.DarkToolbar" />
         <activity
             android:name=".NonTranslucentDrawerActivity"
             android:theme="@style/MaterialDrawerTheme" />
@@ -41,10 +41,6 @@
         <activity
             android:name=".AdvancedActivity"
             android:theme="@style/MaterialDrawerTheme.TranslucentStatus" />
-        <activity
-            android:name=".KeyboardUtilActivity"
-            android:theme="@style/MaterialDrawerTheme.Light.DarkToolbar.TranslucentStatus"
-            android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity
             android:name=".EmbeddedDrawerActivity"
             android:theme="@style/MaterialDrawerTheme" />

diff --git a/app/src/main/java/com/mikepenz/materialdrawer/app/CrossfadeDrawerLayoutActvitiy.java b/app/src/main/java/com/mikepenz/materialdrawer/app/CrossfadeDrawerLayoutActvitiy.java
@@ -78,7 +78,6 @@ protected void onCreate(Bundle savedInstanceState) {
                         new PrimaryDrawerItem().withName(R.string.drawer_item_multi_drawer).withIcon(FontAwesome.Icon.faw_gamepad).withIdentifier(3),
                         new PrimaryDrawerItem().withName(R.string.drawer_item_non_translucent_status_drawer).withIcon(FontAwesome.Icon.faw_eye).withIdentifier(4),
                         new PrimaryDrawerItem().withDescription("A more complex sample").withName(R.string.drawer_item_advanced_drawer).withIcon(GoogleMaterial.Icon.gmd_adb).withIdentifier(5),
-                        new PrimaryDrawerItem().withName(R.string.drawer_item_keyboard_util_drawer).withIcon(GoogleMaterial.Icon.gmd_labels).withIdentifier(6),
                         new SectionDrawerItem().withName(R.string.drawer_item_section_header),
                         new SecondaryDrawerItem().withName(R.string.drawer_item_open_source).withIcon(FontAwesome.Icon.faw_github),
                         new SecondaryDrawerItem().withName(R.string.drawer_item_contact).withIcon(GoogleMaterial.Icon.gmd_format_color_fill).withTag("Bullhorn")

diff --git a/app/src/main/java/com/mikepenz/materialdrawer/app/DrawerActivity.java b/app/src/main/java/com/mikepenz/materialdrawer/app/DrawerActivity.java
@@ -120,7 +120,6 @@ public boolean onProfileChanged(View view, IProfile profile, boolean current) {
                         new PrimaryDrawerItem().withName(R.string.drawer_item_multi_drawer).withDescription(R.string.drawer_item_multi_drawer_desc).withIcon(FontAwesome.Icon.faw_gamepad).withIdentifier(3).withSelectable(false),
                         new PrimaryDrawerItem().withName(R.string.drawer_item_non_translucent_status_drawer).withDescription(R.string.drawer_item_non_translucent_status_drawer_desc).withIcon(FontAwesome.Icon.faw_eye).withIdentifier(4).withSelectable(false).withBadgeStyle(new BadgeStyle().withTextColor(Color.WHITE).withColorRes(R.color.md_red_700)),
                         new PrimaryDrawerItem().withName(R.string.drawer_item_advanced_drawer).withDescription(R.string.drawer_item_advanced_drawer_desc).withIcon(GoogleMaterial.Icon.gmd_adb).withIdentifier(5).withSelectable(false),
-                        new PrimaryDrawerItem().withName(R.string.drawer_item_keyboard_util_drawer).withDescription(R.string.drawer_item_keyboard_util_drawer_desc).withIcon(GoogleMaterial.Icon.gmd_labels).withIdentifier(6).withSelectable(false),
                         new PrimaryDrawerItem().withName(R.string.drawer_item_embedded_drawer).withDescription(R.string.drawer_item_embedded_drawer_desc).withIcon(GoogleMaterial.Icon.gmd_battery).withIdentifier(7).withSelectable(false),
                         new PrimaryDrawerItem().withName(R.string.drawer_item_fullscreen_drawer).withDescription(R.string.drawer_item_fullscreen_drawer_desc).withIcon(GoogleMaterial.Icon.gmd_labels).withIdentifier(8).withSelectable(false),
                         new PrimaryDrawerItem().withName(R.string.drawer_item_custom_container_drawer).withDescription(R.string.drawer_item_custom_container_drawer_desc).withIcon(GoogleMaterial.Icon.gmd_my_location).withIdentifier(9).withSelectable(false),
@@ -167,8 +166,6 @@ public boolean onItemClick(View view, int position, IDrawerItem drawerItem) {
                                 intent = new Intent(DrawerActivity.this, NonTranslucentDrawerActivity.class);
                             } else if (drawerItem.getIdentifier() == 5) {
                                 intent = new Intent(DrawerActivity.this, AdvancedActivity.class);
-                            } else if (drawerItem.getIdentifier() == 6) {
-                                intent = new Intent(DrawerActivity.this, KeyboardUtilActivity.class);
                             } else if (drawerItem.getIdentifier() == 7) {
                                 intent = new Intent(DrawerActivity.this, EmbeddedDrawerActivity.class);
                             } else if (drawerItem.getIdentifier() == 8) {

diff --git a/app/src/main/java/com/mikepenz/materialdrawer/app/EmbeddedDrawerActivity.java b/app/src/main/java/com/mikepenz/materialdrawer/app/EmbeddedDrawerActivity.java
@@ -110,7 +110,6 @@ public boolean onProfileChanged(View view, IProfile profile, boolean current) {
                         new PrimaryDrawerItem().withName(R.string.drawer_item_multi_drawer).withIcon(FontAwesome.Icon.faw_gamepad).withIdentifier(3),
                         new PrimaryDrawerItem().withName(R.string.drawer_item_non_translucent_status_drawer).withIcon(FontAwesome.Icon.faw_eye).withIdentifier(4),
                         new PrimaryDrawerItem().withDescription("A more complex sample").withName(R.string.drawer_item_advanced_drawer).withIcon(GoogleMaterial.Icon.gmd_adb).withIdentifier(5),
-                        new PrimaryDrawerItem().withName(R.string.drawer_item_keyboard_util_drawer).withIcon(GoogleMaterial.Icon.gmd_labels).withIdentifier(6),
                         new SectionDrawerItem().withName(R.string.drawer_item_section_header),
                         new SecondaryDrawerItem().withName(R.string.drawer_item_open_source).withIcon(FontAwesome.Icon.faw_github),
                         new SecondaryDrawerItem().withName(R.string.drawer_item_contact).withIcon(GoogleMaterial.Icon.gmd_format_color_fill).withTag("Bullhorn"),

diff --git a/app/src/main/java/com/mikepenz/materialdrawer/app/KeyboardUtilActivity.java b/app/src/main/java/com/mikepenz/materialdrawer/app/KeyboardUtilActivity.java
diff --git a/app/src/main/java/com/mikepenz/materialdrawer/app/MiniDrawerActivity.java b/app/src/main/java/com/mikepenz/materialdrawer/app/MiniDrawerActivity.java
@@ -120,7 +120,6 @@ public boolean onProfileChanged(View view, IProfile profile, boolean current) {
                         new PrimaryDrawerItem().withName(R.string.drawer_item_multi_drawer).withIcon(FontAwesome.Icon.faw_gamepad).withIdentifier(3),
                         new PrimaryDrawerItem().withName(R.string.drawer_item_non_translucent_status_drawer).withIcon(FontAwesome.Icon.faw_eye).withIdentifier(4),
                         new PrimaryDrawerItem().withDescription("A more complex sample").withName(R.string.drawer_item_advanced_drawer).withIcon(GoogleMaterial.Icon.gmd_adb).withIdentifier(5),
-                        new PrimaryDrawerItem().withName(R.string.drawer_item_keyboard_util_drawer).withIcon(GoogleMaterial.Icon.gmd_labels).withIdentifier(6),
                         new SectionDrawerItem().withName(R.string.drawer_item_section_header),
                         new SecondaryDrawerItem().withName(R.string.drawer_item_open_source).withIcon(FontAwesome.Icon.faw_github),
                         new SecondaryDrawerItem().withName(R.string.drawer_item_contact).withIcon(GoogleMaterial.Icon.gmd_format_color_fill).withTag("Bullhorn"),

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -17,8 +17,6 @@
     <string name="drawer_item_non_translucent_status_drawer_desc">Drawer below statusBar</string>
     <string name="drawer_item_advanced_drawer">Advanced Drawer</string>
     <string name="drawer_item_advanced_drawer_desc">More advanced drawer features</string>
-    <string name="drawer_item_keyboard_util_drawer">KeyboardUtil Drawer</string>
-    <string name="drawer_item_keyboard_util_drawer_desc">KeyboardUtil to (fix) adjustResize</string>
     <string name="drawer_item_embedded_drawer">Embedded Drawer</string>
     <string name="drawer_item_embedded_drawer_desc">Embed the drawer anywhere</string>
     <string name="drawer_item_mini_drawer">MiniDrawer</string>

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Maven stuff
-VERSION_NAME=5.1.9
-VERSION_CODE=519
+VERSION_NAME=5.2.0
+VERSION_CODE=520
 GROUP=com.mikepenz
 
 POM_DESCRIPTION=MaterialDrawer Library

diff --git a/library/build.gradle b/library/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 10
         targetSdkVersion 23
-        versionCode 519
-        versionName '5.1.9'
+        versionCode 520
+        versionName '5.2.0'
     }
     buildTypes {
         release {

diff --git a/library/src/main/java/com/mikepenz/materialdrawer/MiniDrawer.java b/library/src/main/java/com/mikepenz/materialdrawer/MiniDrawer.java
@@ -296,6 +296,7 @@ public View build(Context ctx) {
         mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
         //adapter
         mAdapter = new FastItemAdapter<>();
+        mAdapter.withSelectable(true);
         mAdapter.withAllowDeselection(false);
         mRecyclerView.setAdapter(mAdapter);
 

diff --git a/library/src/main/res/values/library_materialdrawer_strings.xml b/library/src/main/res/values/library_materialdrawer_strings.xml
@@ -10,7 +10,7 @@
         <b>MaterialDrawer</b> the flexible, easy to use, all in one drawer library for your Android project.
         ]]>
     </string>
-    <string name="library_materialdrawer_libraryVersion">5.1.9</string>
+    <string name="library_materialdrawer_libraryVersion">5.2.0</string>
     <string name="library_materialdrawer_libraryWebsite">https://github.com/mikepenz/MaterialDrawer</string>
     <string name="library_materialdrawer_licenseId">apache_2_0</string>
     <string name="library_materialdrawer_isOpenSource">true</string>