From 7eb6c882dc51a4bd58daf6506bfe28c7a9d64756 Mon Sep 17 00:00:00 2001
From: Synced Synapse <synced.synapse@gmail.com>
Date: Fri, 15 Sep 2017 16:56:52 +0100
Subject: [PATCH] Fix now playing panel height

---
 app/src/main/java/org/xbmc/kore/ui/BaseMediaActivity.java | 2 +-
 app/src/main/res/layout/activity_generic_media.xml        | 1 +
 app/src/main/res/layout/now_playing_panel.xml             | 6 ++----
 app/src/main/res/values/dimens.xml                        | 2 --
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/xbmc/kore/ui/BaseMediaActivity.java b/app/src/main/java/org/xbmc/kore/ui/BaseMediaActivity.java
index f75c9c3..e21f7de 100644
--- a/app/src/main/java/org/xbmc/kore/ui/BaseMediaActivity.java
+++ b/app/src/main/java/org/xbmc/kore/ui/BaseMediaActivity.java
@@ -519,7 +519,7 @@ public abstract class BaseMediaActivity extends BaseActivity
 
         Resources resources = getResources();
         int posterWidth = resources.getDimensionPixelOffset(R.dimen.now_playing_panel_art_width);
-        int posterHeight = resources.getDimensionPixelOffset(R.dimen.now_playing_panel_art_height);
+        int posterHeight = resources.getDimensionPixelOffset(R.dimen.now_playing_panel_height);
 
         // If not video, change aspect ration of poster to a square
         boolean isVideo = (getItemResult.type.equals(ListType.ItemsAll.TYPE_MOVIE)) ||
diff --git a/app/src/main/res/layout/activity_generic_media.xml b/app/src/main/res/layout/activity_generic_media.xml
index f49f7d4..d7cb849 100644
--- a/app/src/main/res/layout/activity_generic_media.xml
+++ b/app/src/main/res/layout/activity_generic_media.xml
@@ -35,6 +35,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="bottom"
+            sothree:umanoPanelHeight="@dimen/now_playing_panel_height"
             sothree:umanoShadowHeight="4dp"
             sothree:umanoFadeColor="#00000000"
             sothree:umanoInitialState="hidden"/>
diff --git a/app/src/main/res/layout/now_playing_panel.xml b/app/src/main/res/layout/now_playing_panel.xml
index 816b59f..7eef5b4 100644
--- a/app/src/main/res/layout/now_playing_panel.xml
+++ b/app/src/main/res/layout/now_playing_panel.xml
@@ -14,9 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:sothree="http://schemas.android.com/apk/res-auto"
-       sothree:umanoPanelHeight="@dimen/now_playing_panel_height">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <FrameLayout
         android:id="@+id/fragment_container"
@@ -36,7 +34,7 @@
 
             <ImageView android:id="@+id/npp_poster"
                        android:layout_width="@dimen/now_playing_panel_art_width"
-                       android:layout_height="@dimen/now_playing_panel_art_height"
+                       android:layout_height="@dimen/now_playing_panel_height"
                        android:layout_weight="0"
                        android:scaleType="centerInside"
                        android:contentDescription="@string/poster"/>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c89fe31..c0c877d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -135,7 +135,5 @@
 
     <dimen name="now_playing_panel_height">64dp</dimen>
     <dimen name="now_playing_panel_art_width">48dp</dimen>
-    <dimen name="now_playing_panel_art_height">64dp</dimen>
-
 
 </resources>