Merge branch 'newgui' into develop. closes #407

Conflicts:
	res/layout/feedinfo.xml

1 files changed, 62 insertions, 31 deletions

diff --git a/res/values/styles.xml b/res/values/styles.xml
index d08b8060f..94edd7413 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -33,8 +33,12 @@
         <item name="attr/overlay_background">@color/overlay_light</item>
         <item name="attr/spinner_button">@drawable/spinner_button</item>
         <item name="attr/overlay_drawable">@drawable/overlay_drawable</item>
-        <item name="attr/dragview_background">@drawable/dragview_background</item>
+        <item name="attr/dragview_background">@drawable/ic_drag_handle</item>
         <item name="attr/dragview_float_background">@color/white</item>
+        <item name="attr/nav_drawer_background">@color/white</item>
+        <item name="attr/nav_drawer_toggle">@drawable/ic_drawer</item>
+        <item name="attr/ic_action_overflow">@drawable/ic_action_overflow</item>
+        <item name="attr/ic_new">@drawable/ic_new</item>
     </style>
 
     <style name="Theme.AntennaPod.Dark" parent="@style/Theme.AppCompat">
@@ -69,43 +73,70 @@
         <item name="attr/overlay_background">@color/overlay_dark</item>
         <item name="attr/spinner_button">@drawable/spinner_button_dark</item>
         <item name="attr/overlay_drawable">@drawable/overlay_drawable_dark</item>
-        <item name="attr/dragview_background">@drawable/dragview_background_dark</item>
+        <item name="attr/dragview_background">@drawable/ic_drag_handle_dark</item>
         <item name="attr/dragview_float_background">@color/black</item>
+        <item name="attr/nav_drawer_background">#3B3B3B</item>
+        <item name="attr/nav_drawer_toggle">@drawable/ic_drawer_dark</item>
+        <item name="attr/ic_action_overflow">@drawable/ic_action_overflow_dark</item>
+        <item name="attr/ic_new">@drawable/ic_new_dark</item>
+
     </style>
 
     <style name="UndoBar">
-      <item name="android:layout_width">match_parent</item>
-      <item name="android:layout_height">48dp</item>
-      <item name="android:layout_gravity">bottom</item>
-      <item name="android:layout_marginLeft">8dp</item>
-      <item name="android:layout_marginRight">8dp</item>
-      <item name="android:layout_marginBottom">16dp</item>
-      <item name="android:orientation">horizontal</item>
-      <item name="android:background">@drawable/undobar</item>
-      <item name="android:clickable">true</item>
-      <item name="android:divider">@drawable/undobar_divider</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">48dp</item>
+        <item name="android:layout_gravity">bottom</item>
+        <item name="android:layout_marginLeft">8dp</item>
+        <item name="android:layout_marginRight">8dp</item>
+        <item name="android:layout_marginBottom">16dp</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:background">@drawable/undobar</item>
+        <item name="android:clickable">true</item>
+        <item name="android:divider">@drawable/undobar_divider</item>
     </style>
+
     <style name="UndoBarMessage">
-      <item name="android:layout_width">0dp</item>
-      <item name="android:layout_weight">1</item>
-      <item name="android:layout_height">wrap_content</item>
-      <item name="android:layout_marginLeft">16dp</item>
-      <item name="android:layout_gravity">center_vertical</item>
-      <item name="android:layout_marginRight">16dp</item>
-      <item name="android:textAppearance">?android:textAppearanceMedium</item>
-      <item name="android:textColor">#fff</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">16dp</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:layout_marginRight">16dp</item>
+        <item name="android:textAppearance">?android:textAppearanceMedium</item>
+        <item name="android:textColor">#fff</item>
     </style>
+
     <style name="UndoBarButton">
-      <item name="android:layout_width">wrap_content</item>
-      <item name="android:layout_height">match_parent</item>
-      <item name="android:paddingLeft">16dp</item>
-      <item name="android:paddingRight">16dp</item>
-      <item name="android:background">@drawable/undobar_button</item>
-      <item name="android:drawableLeft">@drawable/ic_undobar_undo</item>
-      <item name="android:drawablePadding">12dp</item>
-      <item name="android:textAppearance">?android:textAppearanceSmall</item>
-      <item name="android:textStyle">bold</item>
-      <item name="android:textColor">#fff</item>
-      <item name="android:text">@string/undo</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:paddingRight">16dp</item>
+        <item name="android:background">@drawable/undobar_button</item>
+        <item name="android:drawableLeft">@drawable/ic_undobar_undo</item>
+        <item name="android:drawablePadding">12dp</item>
+        <item name="android:textAppearance">?android:textAppearanceSmall</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">#fff</item>
+        <item name="android:text">@string/undo</item>
+    </style>
+
+    <style name="AntennaPod.TextView.Heading" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textSize">@dimen/text_size_large</item>
+        <item name="android:textStyle">italic</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+
+    <style name="AntennaPod.TextView.ListItemPrimaryTitle" parent="@android:style/TextAppearance.Small">
+        <item name="android:textSize">15sp</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:lines">2</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="AntennaPod.Dialog.Title" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textSize">@dimen/text_size_medium</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:maxLines">2</item>
+        <item name="android:ellipsize">end</item>
     </style>
 </resources>