mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-01 06:35:09 +00:00
Code Issues Releases Wiki Activity

Fixed previous commit to work on Android API < 19

Browse Source
This commit is contained in:
Albert Vaca
2014-10-04 21:07:57 -07:00
parent 1b4ade0ae1
commit 03bcfecb88
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/kde/kdeconnect/UserInterface/MaxWidthImageButton.java
View File

@@ -6,8 +6,12 @@ import android.util.AttributeSet;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import org.kde.kdeconnect_tp.R;
public class MaxWidthImageButton extends ImageButton { public class MaxWidthImageButton extends ImageButton {
int mMaxWidth = Integer.MAX_VALUE;
public MaxWidthImageButton(Context context) { public MaxWidthImageButton(Context context) {
super(context); super(context);
@@ -15,14 +19,16 @@ public class MaxWidthImageButton extends ImageButton {
public MaxWidthImageButton(Context context, AttributeSet attrs) { public MaxWidthImageButton(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.MaxWidthImageButton);
mMaxWidth = a.getDimensionPixelSize(R.styleable.MaxWidthImageButton_maxWidth, Integer.MAX_VALUE);
} }
@Override @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
int maxWidth = getMaxWidth();
super.onMeasure(widthMeasureSpec, heightMeasureSpec); super.onMeasure(widthMeasureSpec, heightMeasureSpec);
if(getMeasuredWidth() > maxWidth){ if(getMeasuredWidth() > mMaxWidth){
setMeasuredDimension(maxWidth, getMeasuredHeight()); setMeasuredDimension(mMaxWidth, getMeasuredHeight());
} }
} }
} }

3
src/main/res/layout/mpris_control.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -32,7 +33,7 @@
<org.kde.kdeconnect.UserInterface.MaxWidthImageButton <org.kde.kdeconnect.UserInterface.MaxWidthImageButton
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="75dip" android:layout_height="75dip"
android:maxWidth="300dip" app:maxWidth="300dip"
android:id="@+id/play_button" android:id="@+id/play_button"
android:src="@android:drawable/ic_media_play" android:src="@android:drawable/ic_media_play"
android:contentDescription="@string/mpris_play" android:contentDescription="@string/mpris_play"

6
src/main/res/values/attrs.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="MaxWidthImageButton">
<attr name="maxWidth" format="dimension" />
</declare-styleable>
</resources>