Update MaterialMenuIconCompat to use AppCompatActivity

balysv · May 30, 2015 · eb7cc24 · eb7cc24
1 parent c0c9199
commit eb7cc24
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/demo/src/abc_v21/java/com/balysv/materialmenu/demo/abc_v21/BaseActivity.java b/demo/src/abc_v21/java/com/balysv/materialmenu/demo/abc_v21/BaseActivity.java
@@ -1,12 +1,12 @@
 package com.balysv.materialmenu.demo.abc_v21;
 
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 
 import com.balysv.materialmenu.demo.BaseActivityHelper;
 import com.balysv.materialmenu.demo.R;
 
-public abstract class BaseActivity extends ActionBarActivity {
+public abstract class BaseActivity extends AppCompatActivity {
 
     protected BaseActivityHelper helper;
 

diff --git a/demo/src/toolbar/java/com/balysv/materialmenu/demo/toolbar/ToolbarActivity.java b/demo/src/toolbar/java/com/balysv/materialmenu/demo/toolbar/ToolbarActivity.java
@@ -2,7 +2,7 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 
@@ -15,7 +15,7 @@
 import static com.balysv.materialmenu.demo.BaseActivityHelper.intToState;
 
 
-public class ToolbarActivity extends ActionBarActivity {
+public class ToolbarActivity extends AppCompatActivity {
 
     private MaterialMenuIconToolbar materialMenu;
 

diff --git a/demo/src/toolbar/res/layout/toolbar.xml b/demo/src/toolbar/res/layout/toolbar.xml
@@ -164,6 +164,24 @@
                     android:text="@string/set_check"/>
 
 
+                <Button
+                    android:id="@+id/switch_item_show"
+                    android:textColor="@android:color/white"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:padding="4dp"
+                    android:text="@string/set_show"/>
+
+                <Button
+                    android:id="@+id/switch_item_hide"
+                    android:textColor="@android:color/white"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:padding="4dp"
+                    android:text="@string/set_hide"/>
+
             </LinearLayout>
         </RelativeLayout>
     </LinearLayout>

diff --git a/demo/src/toolbar/res/values/styles.xml b/demo/src/toolbar/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="AppTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="colorPrimary">#575757</item>

diff --git a/...-toolbar/src/main/java/com/balysv/materialmenu/extras/toolbar/MaterialMenuIconCompat.java b/...-toolbar/src/main/java/com/balysv/materialmenu/extras/toolbar/MaterialMenuIconCompat.java
@@ -2,19 +2,19 @@
 
 import android.app.Activity;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
 import com.balysv.materialmenu.MaterialMenuBase;
 import com.balysv.materialmenu.MaterialMenuDrawable;
 
 public class MaterialMenuIconCompat extends MaterialMenuBase {
 
-    public MaterialMenuIconCompat(ActionBarActivity activity, int color, MaterialMenuDrawable.Stroke stroke) {
+    public MaterialMenuIconCompat(AppCompatActivity activity, int color, MaterialMenuDrawable.Stroke stroke) {
         super(activity, color, stroke);
     }
 
-    public MaterialMenuIconCompat(ActionBarActivity activity, int color, MaterialMenuDrawable.Stroke stroke, int transformDuration) {
+    public MaterialMenuIconCompat(AppCompatActivity activity, int color, MaterialMenuDrawable.Stroke stroke, int transformDuration) {
         super(activity, color, stroke, transformDuration);
     }
 
@@ -35,7 +35,7 @@ protected boolean providesActionBar() {
 
     @Override
     protected void setActionBarSettings(Activity activity) {
-        ActionBar actionBar = ((ActionBarActivity) activity).getSupportActionBar();
+        ActionBar actionBar = ((AppCompatActivity) activity).getSupportActionBar();
         actionBar.setDisplayShowHomeEnabled(true);
         actionBar.setDisplayUseLogoEnabled(false);
         actionBar.setHomeButtonEnabled(true);