Skip to content

Commit f66762e

Browse files
committed
gh-147 experiment with button-icon
need to specify width/height. didn't feel like it added much, but will leave it in and commented out for now.
1 parent 10e5559 commit f66762e

File tree

1 file changed

+42
-27
lines changed

1 file changed

+42
-27
lines changed

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

+42-27
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,23 @@
3939
android:layout_height="wrap_content"
4040
android:orientation="horizontal"
4141
>
42+
<!--
43+
<com.mikepenz.iconics.view.IconicsImageView
44+
android:id="@+id/btn_icon_image"
45+
android:layout_width="48dp"
46+
android:layout_height="48dp"
47+
app:iiv_color="@color/colorAccentLight"
48+
app:iiv_icon="cmd-flask-outline"
4249
43-
<!-- in most cases, the following is hidden -->
50+
android:layout_alignParentLeft="true"
51+
android:layout_alignParentTop="true"
52+
android:padding="4dp"
53+
android:gravity="center"
54+
android:layout_centerVertical="true"
55+
/>
56+
-->
57+
58+
<!-- in most cases, the following ImageView is hidden -->
4459
<ImageView
4560
android:layout_width="wrap_content"
4661
android:layout_height="wrap_content"
@@ -54,33 +69,33 @@
5469
android:layout_alignParentTop="true"
5570
/>
5671

57-
<TextView
58-
android:layout_alignParentTop="true"
59-
android:layout_toLeftOf="@id/btn_settings"
60-
android:id="@+id/btn_txt"
61-
android:textSize="@dimen/buttonFontSize"
62-
android:textAllCaps="true"
63-
android:layout_width="match_parent"
64-
android:layout_height="wrap_content"
65-
android:gravity="center"
66-
android:minWidth="88dp"
67-
android:minLines="2"
68-
android:padding="4dp"
69-
android:text="Cardview Button"
70-
android:textColor="@color/textPrimary"/>
72+
<TextView
73+
android:layout_alignParentTop="true"
74+
android:layout_toLeftOf="@id/btn_settings"
75+
android:id="@+id/btn_txt"
76+
android:textSize="@dimen/buttonFontSize"
77+
android:textAllCaps="true"
78+
android:layout_width="match_parent"
79+
android:layout_height="wrap_content"
80+
android:gravity="center"
81+
android:minWidth="88dp"
82+
android:minLines="2"
83+
android:padding="4dp"
84+
android:text="Cardview Button"
85+
android:textColor="@color/textPrimary"/>
7186

72-
<TextView
73-
android:layout_below="@id/btn_txt"
74-
android:id="@+id/btn_txt_config"
75-
android:layout_width="match_parent"
76-
android:layout_height="wrap_content"
77-
android:textSize="@dimen/buttonConfigFontSize"
78-
android:textAllCaps="false"
79-
android:padding="4dp"
80-
android:gravity="center"
81-
android:text="generator config"
82-
android:textColor="@color/colorAccentDarkDark"
83-
/>
87+
<TextView
88+
android:layout_below="@id/btn_txt"
89+
android:id="@+id/btn_txt_config"
90+
android:layout_width="match_parent"
91+
android:layout_height="wrap_content"
92+
android:textSize="@dimen/buttonConfigFontSize"
93+
android:textAllCaps="false"
94+
android:padding="4dp"
95+
android:gravity="center"
96+
android:text="generator config"
97+
android:textColor="@color/colorAccentDarkDark"
98+
/>
8499

85100
</RelativeLayout>
86101
</android.support.v7.widget.CardView>

0 commit comments

Comments
 (0)