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

move the Button text size back to style

This commit is contained in:
tibbi 2016-01-02 18:47:16 +01:00
parent ad9c907f12
commit e423258a04
4 changed files with 24 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,8 +39,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="%" android:text="%"/>
android:textSize="@dimen/button_text_size"/>
<Button <Button
android:id="@+id/btn_power" android:id="@+id/btn_power"
@ -48,8 +47,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="^" android:text="^"/>
android:textSize="@dimen/button_text_size"/>
<Button <Button
android:id="@+id/btn_root" android:id="@+id/btn_root"
@ -57,8 +55,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="√" android:text="√"/>
android:textSize="@dimen/button_text_size"/>
<Button <Button
android:id="@+id/btn_clear" android:id="@+id/btn_clear"
@ -66,8 +63,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="C" android:text="C"/>
android:textSize="@dimen/button_text_size"/>
<Button <Button
android:id="@+id/btn_reset" android:id="@+id/btn_reset"
@ -76,7 +72,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="AC" android:text="AC"
android:textSize="@dimen/button_text_size"
android:visibility="gone"/> android:visibility="gone"/>
</LinearLayout> </LinearLayout>
@ -92,8 +87,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="7" android:text="7"/>
android:textSize="@dimen/button_text_size"/>
<Button <Button
android:id="@+id/btn_8" android:id="@+id/btn_8"
@ -101,8 +95,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="8" android:text="8"/>
android:textSize="@dimen/button_text_size"/>
<Button <Button
android:id="@+id/btn_9" android:id="@+id/btn_9"
@ -110,8 +103,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="9" android:text="9"/>
android:textSize="@dimen/button_text_size"/>
<Button <Button
android:id="@+id/btn_divide" android:id="@+id/btn_divide"
@ -119,8 +111,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="÷" android:text="÷"/>
android:textSize="@dimen/button_text_size"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -135,8 +126,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="4" android:text="4"/>
android:textSize="@dimen/button_text_size"/>
<Button <Button
android:id="@+id/btn_5" android:id="@+id/btn_5"
@ -144,8 +134,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="5" android:text="5"/>
android:textSize="@dimen/button_text_size"/>
<Button <Button
android:id="@+id/btn_6" android:id="@+id/btn_6"
@ -153,8 +142,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="6" android:text="6"/>
android:textSize="@dimen/button_text_size"/>
<Button <Button
android:id="@+id/btn_multiply" android:id="@+id/btn_multiply"
@ -162,8 +150,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="*" android:text="*"/>
android:textSize="@dimen/button_text_size"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -178,8 +165,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="1" android:text="1"/>
android:textSize="@dimen/button_text_size"/>
<Button <Button
android:id="@+id/btn_2" android:id="@+id/btn_2"
@ -187,8 +173,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="2" android:text="2"/>
android:textSize="@dimen/button_text_size"/>
<Button <Button
android:id="@+id/btn_3" android:id="@+id/btn_3"
@ -196,8 +181,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="3" android:text="3"/>
android:textSize="@dimen/button_text_size"/>
<Button <Button
android:id="@+id/btn_minus" android:id="@+id/btn_minus"
@ -205,8 +189,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="-" android:text="-"/>
android:textSize="@dimen/button_text_size"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -221,8 +204,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="0" android:text="0"/>
android:textSize="@dimen/button_text_size"/>
<Button <Button
android:id="@+id/btn_decimal" android:id="@+id/btn_decimal"
@ -230,8 +212,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="." android:text="."/>
android:textSize="@dimen/button_text_size"/>
<Button <Button
android:id="@+id/btn_equals" android:id="@+id/btn_equals"
@ -239,8 +220,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="=" android:text="="/>
android:textSize="@dimen/button_text_size"/>
<Button <Button
android:id="@+id/btn_plus" android:id="@+id/btn_plus"
@ -248,8 +228,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:text="+" android:text="+"/>
android:textSize="@dimen/button_text_size"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

3
app/src/main/res/layout/widget_config.xml
View File

@ -32,6 +32,7 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:paddingLeft="@dimen/activity_margin" android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin"
android:text="Save"/> android:text="Save"
android:textSize="@dimen/config_text_size"/>
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>

1
app/src/main/res/values/dimens.xml
View File

@ -1,6 +1,7 @@
<resources> <resources>
<dimen name="activity_margin">16dp</dimen> <dimen name="activity_margin">16dp</dimen>
<dimen name="result_padding">32dp</dimen> <dimen name="result_padding">32dp</dimen>
<dimen name="config_text_size">18sp</dimen>
<dimen name="button_text_size">28sp</dimen> <dimen name="button_text_size">28sp</dimen>
<dimen name="display_text_size">36sp</dimen> <dimen name="display_text_size">36sp</dimen>
</resources> </resources>

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

@ -13,6 +13,7 @@
<item name="android:textColor">@android:color/white</item> <item name="android:textColor">@android:color/white</item>
<item name="background">@drawable/button</item> <item name="background">@drawable/button</item>
<item name="android:background">@drawable/button</item> <item name="android:background">@drawable/button</item>
<item name="android:textSize">@dimen/button_text_size</item>
</style> </style>
<style name="MyWidgetConfigTheme" parent="@style/AppTheme"> <style name="MyWidgetConfigTheme" parent="@style/AppTheme">