Fixed album cover in landscape now playing screen

app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java

@@ -29,7 +29,7 @@ import com.kabouzeid.gramophone.util.ColorUtil;
 import com.kabouzeid.gramophone.util.MusicUtil;
 import com.kabouzeid.gramophone.util.Util;
 import com.kabouzeid.gramophone.util.ViewUtil;
-import com.kabouzeid.gramophone.views.SquareLayout;
+import com.kabouzeid.gramophone.views.WidthFitSquareLayout;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 
 import org.solovyev.android.views.llm.LinearLayoutManager;
@@ -339,7 +339,7 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
 
         @Override
         public void setUpPanelAndAlbumCoverHeight(PlayerFragment fragment) {
-            SquareLayout albumCoverContainer = (SquareLayout) fragment.getView().findViewById(R.id.album_cover_container);
+            WidthFitSquareLayout albumCoverContainer = (WidthFitSquareLayout) fragment.getView().findViewById(R.id.album_cover_container);
             int topMargin = fragment.getResources().getDimensionPixelSize(R.dimen.status_bar_padding);
 
             final int availablePanelHeight = fragment.slidingUpPanelLayout.getHeight() - fragment.getView().findViewById(R.id.player_content).getHeight() + topMargin;

app/src/main/java/com/kabouzeid/gramophone/views/HeightFitSquareLayout.java

@@ -0,0 +1,43 @@
+package com.kabouzeid.gramophone.views;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
+public class HeightFitSquareLayout extends FrameLayout {
+
+    private boolean forceSquare = true;
+
+    public HeightFitSquareLayout(Context context) {
+        super(context);
+    }
+
+    public HeightFitSquareLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public HeightFitSquareLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public HeightFitSquareLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        //noinspection SuspiciousNameCombination
+        super.onMeasure(forceSquare ? heightMeasureSpec : widthMeasureSpec, heightMeasureSpec);
+    }
+
+    public void forceSquare(boolean forceSquare) {
+        this.forceSquare = forceSquare;
+        requestLayout();
+    }
+}

app/src/main/java/com/kabouzeid/gramophone/views/WidthFitSquareImageView.java

@@ -1,7 +1,8 @@
 package com.kabouzeid.gramophone.views;
 
+import android.annotation.TargetApi;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.widget.ImageView;
 
@@ -14,12 +15,17 @@ public class WidthFitSquareImageView extends ImageView {
         super(context);
     }
 
-    public WidthFitSquareImageView(@NonNull Context context, AttributeSet attrs) {
+    public WidthFitSquareImageView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public WidthFitSquareImageView(@NonNull Context context, AttributeSet attrs, int defStyle) {
+    public WidthFitSquareImageView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyle);
+        super(context, attrs, defStyleAttr);
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public WidthFitSquareImageView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
     }
 
     @Override

app/src/main/java/com/kabouzeid/gramophone/views/WidthFitSquareLayout.java

@@ -9,24 +9,24 @@ import android.widget.FrameLayout;
 /**
  * @author Karim Abou Zeid (kabouzeid)
  */
-public class SquareLayout extends FrameLayout {
+public class WidthFitSquareLayout extends FrameLayout {
 
     private boolean forceSquare = true;
 
-    public SquareLayout(Context context) {
+    public WidthFitSquareLayout(Context context) {
         super(context);
     }
 
-    public SquareLayout(Context context, AttributeSet attrs) {
+    public WidthFitSquareLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public SquareLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+    public WidthFitSquareLayout(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public SquareLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    public WidthFitSquareLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 

app/src/main/res/layout-land/fragment_player.xml

@@ -20,16 +20,22 @@
             style="@style/Toolbar"
             android:background="@android:color/transparent" />
 
-        <android.support.percent.PercentRelativeLayout
+        <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <!--suppress AndroidDomInspection -->
+            <com.kabouzeid.gramophone.views.HeightFitSquareLayout
-            <fragment
+                android:id="@+id/cover_container"
-                android:id="@+id/player_album_cover_fragment"
+                android:layout_width="match_parent"
-                class="com.kabouzeid.gramophone.ui.fragments.player.PlayerAlbumCoverFragment"
+                android:layout_height="match_parent">
-                app:layout_aspectRatio="100%"
+
-                app:layout_heightPercent="100%" />
+                <fragment
+                    android:id="@+id/player_album_cover_fragment"
+                    class="com.kabouzeid.gramophone.ui.fragments.player.PlayerAlbumCoverFragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+
+            </com.kabouzeid.gramophone.views.HeightFitSquareLayout>
 
             <com.sothree.slidinguppanel.SlidingUpPanelLayout android:id="@+id/player_sliding_layout"
                 xmlns:android="http://schemas.android.com/apk/res/android"
@@ -37,8 +43,8 @@
                 xmlns:sothree="http://schemas.android.com/apk/res-auto"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_toEndOf="@+id/player_album_cover_fragment"
+                android:layout_toEndOf="@+id/cover_container"
-                android:layout_toRightOf="@+id/player_album_cover_fragment"
+                android:layout_toRightOf="@+id/cover_container"
                 android:clickable="false"
                 android:focusable="true"
                 android:gravity="bottom"
@@ -127,7 +133,7 @@
 
             </com.sothree.slidinguppanel.SlidingUpPanelLayout>
 
-        </android.support.percent.PercentRelativeLayout>
+        </RelativeLayout>
 
     </LinearLayout>
 </FrameLayout>

app/src/main/res/layout/fragment_album_cover.xml

@@ -4,13 +4,20 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/transparent">
+    android:background="@android:color/black">
 
-    <com.kabouzeid.gramophone.views.WidthFitSquareImageView
+    <ImageView
         android:id="@+id/player_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
         tools:ignore="ContentDescription,UnusedAttribute" />
 
+    <!--<ImageView-->
+    <!--android:id="@+id/player_image_background"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="match_parent"-->
+    <!--android:scaleType="centerCrop"-->
+    <!--tools:ignore="ContentDescription,UnusedAttribute" />-->
+
 </FrameLayout>

app/src/main/res/layout/fragment_player.xml

@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <com.kabouzeid.gramophone.views.SquareLayout
+                <com.kabouzeid.gramophone.views.WidthFitSquareLayout
                     android:id="@+id/album_cover_container"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                </com.kabouzeid.gramophone.views.SquareLayout>
+                </com.kabouzeid.gramophone.views.WidthFitSquareLayout>
 
                 <fragment
                     android:id="@+id/playback_controls_fragment"