Use toolbar in MainActivity instead of actionbar

2 files changed, 20 insertions, 11 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 7d242dece..d0e70be5d 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -14,6 +14,7 @@ import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
@@ -66,6 +67,7 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
             POS_HISTORY = 3,
             POS_ADD = 4;
 
+    private Toolbar toolbar;
     private ExternalPlayerFragment externalPlayerFragment;
     private DrawerLayout drawerLayout;
 
@@ -81,15 +83,15 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        setTheme(UserPreferences.getTheme());
+        setTheme(UserPreferences.getNoTitleTheme());
         super.onCreate(savedInstanceState);
         StorageUtils.checkStorageAvailability(this);
         setContentView(R.layout.main);
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
+        setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
         drawerTitle = currentTitle = getTitle();
 
-
         drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
         navList = (ListView) findViewById(R.id.nav_list);
         navDrawer = findViewById(R.id.nav_layout);
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 0a7b7ef74..914d5fa6f 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -1,31 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:id="@+id/content"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
 
         <FrameLayout
             android:id="@+id/playerFragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"/>
+            android:layout_alignParentBottom="true" />
 
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:background="?attr/colorPrimary"
+            android:minHeight="?attr/actionBarSize"/>
         <FrameLayout
             android:id="@+id/main_view"
             android:layout_width="match_parent"
             android:layout_height="0px"
-            android:layout_alignParentTop="true"
-            android:layout_above="@id/playerFragment"/>
+            android:layout_above="@id/playerFragment"
+            android:layout_below="@id/toolbar"
+            android:foreground="?android:windowContentOverlay" />
 
     </RelativeLayout>
 
-    <include layout="@layout/nav_list"/>
+    <include layout="@layout/nav_list" />
 
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file