Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

scale button size on compose activity

This commit is contained in:
Len Chan 2019-03-30 14:17:38 +08:00
parent 1636f60636
commit 8aefa82386
3 changed files with 61 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/fr/gouv/etalab/mastodon/helper/SquareButton.java Normal file
View File

@ -0,0 +1,28 @@
package fr.gouv.etalab.mastodon.helper;
import android.content.Context;
import android.util.AttributeSet;
public class SquareButton extends android.support.v7.widget.AppCompatButton {
public SquareButton(Context context) {
super(context);
}
public SquareButton(Context context, AttributeSet attrs) {
super(context, attrs);
}
public SquareButton(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
int height = MeasureSpec.getSize(heightMeasureSpec);
super.onMeasure(
MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY),
MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));
}
}

28
app/src/main/java/fr/gouv/etalab/mastodon/helper/SquareImageButton.java Normal file
View File

@ -0,0 +1,28 @@
package fr.gouv.etalab.mastodon.helper;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.ImageButton;
public class SquareImageButton extends android.support.v7.widget.AppCompatImageButton {
public SquareImageButton(Context context) {
super(context);
}
public SquareImageButton(Context context, AttributeSet attrs) {
super(context, attrs);
}
public SquareImageButton(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
int height = MeasureSpec.getSize(heightMeasureSpec);
super.onMeasure(
MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY),
MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));
}
}

16
app/src/main/res/layout/activity_toot.xml
View File

@ -97,7 +97,7 @@
android:orientation="horizontal"
android:layout_height="wrap_content">
<ImageButton
<fr.gouv.etalab.mastodon.helper.SquareImageButton
android:id="@+id/toot_picture"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="45dp"
@ -106,7 +106,7 @@
android:scaleType="centerCrop"
android:contentDescription="@string/toot_select_image"
android:src="@drawable/ic_insert_photo" />
<ImageButton
<fr.gouv.etalab.mastodon.helper.SquareImageButton
android:id="@+id/poll_action"
android:visibility="gone"
android:scaleType="centerCrop"
@ -116,9 +116,7 @@
style="@style/Widget.AppCompat.Button.Colored"
android:src="@drawable/ic_view_list_poll"
android:contentDescription="@string/poll" />
<ImageButton
android:layout_marginLeft="5dp"
android:layout_marginStart="5dp"
<fr.gouv.etalab.mastodon.helper.SquareImageButton
android:scaleType="centerCrop"
android:id="@+id/toot_visibility"
android:adjustViewBounds="true"
@ -128,7 +126,7 @@
android:src="@drawable/ic_public"
android:contentDescription="@string/toot_visibility_tilte" />
<Button
<fr.gouv.etalab.mastodon.helper.SquareButton
android:id="@+id/toot_cw"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="45dp"
@ -136,20 +134,16 @@
android:scaleType="fitXY"
android:layout_gravity="center"
android:adjustViewBounds="true"
android:layout_marginStart="5dp"
android:layout_marginLeft="5dp"
android:padding="2dp"
android:text="@string/cw" />
<ImageButton
<fr.gouv.etalab.mastodon.helper.SquareImageButton
android:id="@+id/toot_emoji"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_gravity="center"
android:layout_marginStart="5dp"
android:adjustViewBounds="true"
android:layout_marginLeft="5dp"
android:contentDescription="@string/emoji_picker"
android:minWidth="0dp"
android:minHeight="0dp"