fenix
/
Simple-Calculator
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

set the button text size directly, not through a style

This commit is contained in:
tibbi 2016-01-02 14:52:14 +01:00
parent 7389ec8dbc
commit fed4e15afb
2 changed files with 41 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
app/src/main/res/layout/activity_main.xml
View File

@ -32,43 +32,43 @@
<Button
android:id="@+id/btn_modulo"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="%"/>
android:text="%"
android:textSize="@dimen/button_text_size"/>
<Button
android:id="@+id/btn_power"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="^"/>
android:text="^"
android:textSize="@dimen/button_text_size"/>
<Button
android:id="@+id/btn_root"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="√"/>
android:text="√"
android:textSize="@dimen/button_text_size"/>
<Button
android:id="@+id/btn_clear"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="C"/>
android:text="C"
android:textSize="@dimen/button_text_size"/>
<Button
android:id="@+id/btn_reset"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="AC"
android:textSize="@dimen/button_text_size"
android:visibility="gone"/>
</LinearLayout>
@ -80,35 +80,35 @@
<Button
android:id="@+id/btn_7"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="7"/>
android:text="7"
android:textSize="@dimen/button_text_size"/>
<Button
android:id="@+id/btn_8"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="8"/>
android:text="8"
android:textSize="@dimen/button_text_size"/>
<Button
android:id="@+id/btn_9"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="9"/>
android:text="9"
android:textSize="@dimen/button_text_size"/>
<Button
android:id="@+id/btn_divide"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="÷"/>
android:text="÷"
android:textSize="@dimen/button_text_size"/>
</LinearLayout>
<LinearLayout
@ -119,35 +119,35 @@
<Button
android:id="@+id/btn_4"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="4"/>
android:text="4"
android:textSize="@dimen/button_text_size"/>
<Button
android:id="@+id/btn_5"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="5"/>
android:text="5"
android:textSize="@dimen/button_text_size"/>
<Button
android:id="@+id/btn_6"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="6"/>
android:text="6"
android:textSize="@dimen/button_text_size"/>
<Button
android:id="@+id/btn_multiply"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="*"/>
android:text="*"
android:textSize="@dimen/button_text_size"/>
</LinearLayout>
<LinearLayout
@ -158,35 +158,35 @@
<Button
android:id="@+id/btn_1"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="1"/>
android:text="1"
android:textSize="@dimen/button_text_size"/>
<Button
android:id="@+id/btn_2"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="2"/>
android:text="2"
android:textSize="@dimen/button_text_size"/>
<Button
android:id="@+id/btn_3"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="3"/>
android:text="3"
android:textSize="@dimen/button_text_size"/>
<Button
android:id="@+id/btn_minus"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="-"/>
android:text="-"
android:textSize="@dimen/button_text_size"/>
</LinearLayout>
<LinearLayout
@ -197,35 +197,35 @@
<Button
android:id="@+id/btn_0"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="0"/>
android:text="0"
android:textSize="@dimen/button_text_size"/>
<Button
android:id="@+id/btn_decimal"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="."/>
android:text="."
android:textSize="@dimen/button_text_size"/>
<Button
android:id="@+id/btn_equals"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="="/>
android:text="="
android:textSize="@dimen/button_text_size"/>
<Button
android:id="@+id/btn_plus"
style="@style/MyButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="+"/>
android:text="+"
android:textSize="@dimen/button_text_size"/>
</LinearLayout>
</LinearLayout>
</RelativeLayout>

5
app/src/main/res/values/styles.xml
View File

@ -5,9 +5,4 @@
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>
<style name="MyButtonStyle">
<item name="android:textSize">@dimen/button_text_size</item>
</style>
</resources>