Merge branch 'release/v2.8.9'

mikepenz · Jul 8, 2017 · 0a15cab · 0a15cab
2 parents a2e0f98 + bd347b2
commit 0a15cab
Show file tree

Hide file tree

Showing 22 changed files with 870 additions and 375 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ Provide additional fonts for you project, or even create your custom font with j
 
 ## 1. Provide the gradle dependency
 ```gradle
-compile "com.mikepenz:iconics-core:2.8.8@aar"
+compile "com.mikepenz:iconics-core:2.8.9@aar"
 compile "com.android.support:appcompat-v7:${supportLibVersion}"
 ```
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 28801
-        versionName "2.8.8"
+        versionCode 28901
+        versionName "2.8.9"
     }
 
     buildTypes {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
         <activity
             android:name=".PlaygroundActivity"
             android:label="@string/title_activity_playground"
-            android:theme="@style/MaterialDrawerTheme.Light.DarkToolbar.ActionBar" />
+            android:theme="@style/MaterialDrawerTheme.Light.DarkToolbar" />
         <activity
             android:name=".AutomaticActivity"
             android:label="@string/title_activity_automatic"

diff --git a/app/src/main/java/com/mikepenz/iconics/sample/PlaygroundActivity.java b/app/src/main/java/com/mikepenz/iconics/sample/PlaygroundActivity.java
@@ -16,11 +16,12 @@
 
 package com.mikepenz.iconics.sample;
 
-import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.StateListDrawable;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.BackgroundColorSpan;
@@ -29,6 +30,8 @@
 import android.text.style.ImageSpan;
 import android.text.style.RelativeSizeSpan;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
@@ -42,15 +45,21 @@
 import com.mikepenz.iconics.Iconics;
 import com.mikepenz.iconics.IconicsArrayBuilder;
 import com.mikepenz.iconics.IconicsDrawable;
+import com.mikepenz.iconics.utils.IconicsMenuInflaterUtil;
 import com.mikepenz.octicons_typeface_library.Octicons;
 
 
-public class PlaygroundActivity extends Activity {
+public class PlaygroundActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_playground);
+
+        // Handle Toolbar
+        final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         //Show how to style the text of an existing TextView
         TextView tv1 = (TextView) findViewById(R.id.test1);
@@ -105,7 +114,22 @@ protected void onCreate(Bundle savedInstanceState) {
         listView.setAdapter(new IconsAdapter(this, array));
 
     }
-
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home){
+            onBackPressed();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        IconicsMenuInflaterUtil.inflate(getMenuInflater(), this, R.menu.menu_playground, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
     private class IconsAdapter extends ArrayAdapter<IconicsDrawable> {
 
         private final LayoutInflater mInflater;