Skip to content

Commit d76c432

Browse files
author
Jakub Pelczar
committed
Added minimum height
1 parent 2f9a00f commit d76c432

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

app/src/main/java/pl/sigmapoint/CreateFragment.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,8 @@ private void generate() {
245245
generatedCB.setImage(position, getResources().getDrawable(R.drawable.ic_owl), ImageView.ScaleType.FIT_CENTER, 0, null);
246246
}
247247
generatedCB.setElevationEnabled(elevationTB.isChecked());
248+
generatedCB.setImageColors(frameColorNormalCB.getFrameColorNormal(), frameColorPressedCB.getFrameColorPressed(), frameColorDisabledCB.getFrameColorDisabled());
249+
248250
if (getActivity() instanceof MainActivity) {
249251
((MainActivity) getActivity()).createdButton = generatedCB;
250252
((MainActivity) getActivity()).startGenerated();

library/src/main/java/pl/sigmapoint/customview/CustomButton.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,16 @@ public void setEnabled(boolean enabled) {
271271
imageContainer.setEnabled(enabled);
272272
}
273273

274+
@Override
275+
public int getMinimumHeight() {
276+
return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 48, getContext().getResources().getDisplayMetrics());
277+
}
278+
279+
@Override
280+
protected int getSuggestedMinimumHeight() {
281+
return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 48, getContext().getResources().getDisplayMetrics());
282+
}
283+
274284
private void setContent() {
275285
removeAllViews();
276286
container.removeAllViews();

0 commit comments

Comments
 (0)