From de7d9442300fece9e35c78be8ab7926828cac9ba Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Thu, 1 Feb 2018 11:45:09 +0100
Subject: [PATCH] Get rid of MaxWidthImageButton

Summary: There is no need to implement a custom view for that. It is only used in MPRIS Activity, which looks almost the same now, except that the play button aligns with the buttons beneath, which is better IMHO.

Reviewers: #kde_connect, mtijink

Reviewed By: #kde_connect, mtijink

Subscribers: #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D9520
---
 res/layout/mpris_control.xml                  |  5 +-
 res/values/attrs.xml                          |  6 --
 .../UserInterface/MaxWidthImageButton.java    | 55 -------------------
 3 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 res/values/attrs.xml
 delete mode 100644 src/org/kde/kdeconnect/UserInterface/MaxWidthImageButton.java

diff --git a/res/layout/mpris_control.xml b/res/layout/mpris_control.xml
index 60cdb752..70d47b1a 100644
--- a/res/layout/mpris_control.xml
+++ b/res/layout/mpris_control.xml
@@ -41,10 +41,9 @@
         android:layout_gravity="center"
     />
 
-    <org.kde.kdeconnect.UserInterface.MaxWidthImageButton
+    <ImageButton
         android:layout_width="fill_parent"
-        android:layout_height="75dip"
-        app:maxWidth="300dip"
+        android:layout_height="75dp"
         android:id="@+id/play_button"
         android:src="@drawable/ic_play_black"
         android:contentDescription="@string/mpris_play"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
deleted file mode 100644
index ce590227..00000000
--- a/res/values/attrs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <declare-styleable name="MaxWidthImageButton">
-        <attr name="maxWidth" format="dimension" />
-    </declare-styleable>
-</resources>
\ No newline at end of file
diff --git a/src/org/kde/kdeconnect/UserInterface/MaxWidthImageButton.java b/src/org/kde/kdeconnect/UserInterface/MaxWidthImageButton.java
deleted file mode 100644
index 7f97e586..00000000
--- a/src/org/kde/kdeconnect/UserInterface/MaxWidthImageButton.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-*/
-
-package org.kde.kdeconnect.UserInterface;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.util.AttributeSet;
-import android.widget.ImageButton;
-
-import org.kde.kdeconnect_tp.R;
-
-public class MaxWidthImageButton extends ImageButton {
-
-    int mMaxWidth = Integer.MAX_VALUE;
-
-    public MaxWidthImageButton(Context context) {
-
-        super(context);
-    }
-
-    public MaxWidthImageButton(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.MaxWidthImageButton);
-        mMaxWidth = a.getDimensionPixelSize(R.styleable.MaxWidthImageButton_maxWidth, Integer.MAX_VALUE);
-        a.recycle();
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        if(getMeasuredWidth() > mMaxWidth){
-            setMeasuredDimension(mMaxWidth, getMeasuredHeight());
-        }
-    }
-}
-