TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Buttons now use drawable padding (via InsetDrawable) to have some margins between them

Browse Source
This commit is contained in:
serso
2015-02-05 14:39:16 +01:00
parent c85f5a2f25
commit c5748e2d94
26 changed files with 178 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
android-app/src/main/res/drawable/blue_button_dark_shape.xml
View File

@@ -22,10 +22,16 @@
~ Site: http://se.solovyev.org
-->
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<gradient
a:startColor="#000d1f"
<inset xmlns:a="http://schemas.android.com/apk/res/android"
a:insetBottom="@dimen/cpp_button_padding"
a:insetLeft="@dimen/cpp_button_padding"
a:insetRight="@dimen/cpp_button_padding"
a:insetTop="@dimen/cpp_button_padding">
<shape>
<gradient
a:angle="90"
a:endColor="#002255"
a:angle="90"/>
<corners a:radius="0dp"/>
</shape>
a:startColor="#000d1f" />
<corners a:radius="0dp" />
</shape>
</inset>

18
android-app/src/main/res/drawable/blue_button_shape.xml
View File

@@ -22,10 +22,16 @@
~ Site: http://se.solovyev.org
-->
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<gradient
a:startColor="#001c45"
<inset xmlns:a="http://schemas.android.com/apk/res/android"
a:insetBottom="@dimen/cpp_button_padding"
a:insetLeft="@dimen/cpp_button_padding"
a:insetRight="@dimen/cpp_button_padding"
a:insetTop="@dimen/cpp_button_padding">
<shape>
<gradient
a:angle="90"
a:endColor="#003481"
a:angle="90"/>
<corners a:radius="0dp"/>
</shape>
a:startColor="#001c45" />
<corners a:radius="0dp" />
</shape>
</inset>

15
android-app/src/main/res/drawable/cpp_wizard_button_shape_normal.xml
View File

@@ -20,7 +20,14 @@
~ Site: http://se.solovyev.org
-->
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<solid a:color="@color/cpp_wizard_button_normal"/>
<corners a:radius="1dp"/>
</shape>
<inset xmlns:a="http://schemas.android.com/apk/res/android"
a:insetBottom="@dimen/cpp_button_padding"
a:insetLeft="@dimen/cpp_button_padding"
a:insetRight="@dimen/cpp_button_padding"
a:insetTop="@dimen/cpp_button_padding">
<shape>
<solid a:color="@color/cpp_wizard_button_normal" />
<corners a:radius="@dimen/cpp_button_corner" />
</shape>
</inset>

14
android-app/src/main/res/drawable/cpp_wizard_button_shape_pressed.xml
View File

@@ -20,7 +20,13 @@
~ Site: http://se.solovyev.org
-->
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<solid a:color="@color/cpp_wizard_button_pressed"/>
<corners a:radius="1dp"/>
</shape>
<inset xmlns:a="http://schemas.android.com/apk/res/android"
a:insetBottom="@dimen/cpp_button_padding"
a:insetLeft="@dimen/cpp_button_padding"
a:insetRight="@dimen/cpp_button_padding"
a:insetTop="@dimen/cpp_button_padding">
<shape>
<solid a:color="@color/cpp_wizard_button_pressed" />
<corners a:radius="@dimen/cpp_button_corner" />
</shape>
</inset>

18
android-app/src/main/res/drawable/gray_button_dark_shape.xml
View File

@@ -22,10 +22,16 @@
~ Site: http://se.solovyev.org
-->
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<gradient
a:startColor="#000000"
<inset xmlns:a="http://schemas.android.com/apk/res/android"
a:insetBottom="@dimen/cpp_button_padding"
a:insetLeft="@dimen/cpp_button_padding"
a:insetRight="@dimen/cpp_button_padding"
a:insetTop="@dimen/cpp_button_padding">
<shape>
<gradient
a:angle="90"
a:endColor="#333333"
a:angle="90"/>
<corners a:radius="0dp"/>
</shape>
a:startColor="#000000" />
<corners a:radius="0dp" />
</shape>
</inset>

18
android-app/src/main/res/drawable/gray_button_shape.xml
View File

@@ -22,10 +22,16 @@
~ Site: http://se.solovyev.org
-->
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<gradient
a:startColor="#071622"
<inset xmlns:a="http://schemas.android.com/apk/res/android"
a:insetBottom="@dimen/cpp_button_padding"
a:insetLeft="@dimen/cpp_button_padding"
a:insetRight="@dimen/cpp_button_padding"
a:insetTop="@dimen/cpp_button_padding">
<shape>
<gradient
a:angle="90"
a:endColor="#253541"
a:angle="90"/>
<corners a:radius="0dp"/>
</shape>
a:startColor="#071622" />
<corners a:radius="0dp" />
</shape>
</inset>

15
android-app/src/main/res/drawable/metro_blue_button_shape.xml
View File

@@ -19,8 +19,13 @@
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<solid a:color="@color/cpp_metro_blue"/>
<corners a:radius="1dp"/>
</shape>
<inset xmlns:a="http://schemas.android.com/apk/res/android"
a:insetBottom="@dimen/cpp_button_padding"
a:insetLeft="@dimen/cpp_button_padding"
a:insetRight="@dimen/cpp_button_padding"
a:insetTop="@dimen/cpp_button_padding">
<shape>
<solid a:color="@color/cpp_metro_blue" />
<corners a:radius="@dimen/cpp_button_corner" />
</shape>
</inset>

15
android-app/src/main/res/drawable/metro_button_dark_shape.xml
View File

@@ -20,7 +20,14 @@
~ Site: http://se.solovyev.org
-->
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<solid a:color="@color/cpp_metro_button"/>
<corners a:radius="1dp"/>
</shape>
<inset xmlns:a="http://schemas.android.com/apk/res/android"
a:insetBottom="@dimen/cpp_button_padding"
a:insetLeft="@dimen/cpp_button_padding"
a:insetRight="@dimen/cpp_button_padding"
a:insetTop="@dimen/cpp_button_padding">
<shape>
<solid a:color="@color/cpp_metro_button" />
<corners a:radius="@dimen/cpp_button_corner" />
</shape>
</inset>

14
android-app/src/main/res/drawable/metro_button_green_shape.xml
View File

@@ -20,7 +20,13 @@
~ Site: http://se.solovyev.org
-->
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<solid a:color="@color/cpp_metro_green"/>
<corners a:radius="1dp"/>
</shape>
<inset xmlns:a="http://schemas.android.com/apk/res/android"
a:insetBottom="@dimen/cpp_button_padding"
a:insetLeft="@dimen/cpp_button_padding"
a:insetRight="@dimen/cpp_button_padding"
a:insetTop="@dimen/cpp_button_padding">
<shape>
<solid a:color="@color/cpp_metro_green" />
<corners a:radius="@dimen/cpp_button_corner" />
</shape>
</inset>

14
android-app/src/main/res/drawable/metro_button_light_shape.xml
View File

@@ -20,7 +20,13 @@
~ Site: http://se.solovyev.org
-->
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<solid a:color="@color/cpp_metro_button_light"/>
<corners a:radius="1dp"/>
</shape>
<inset xmlns:a="http://schemas.android.com/apk/res/android"
a:insetBottom="@dimen/cpp_button_padding"
a:insetLeft="@dimen/cpp_button_padding"
a:insetRight="@dimen/cpp_button_padding"
a:insetTop="@dimen/cpp_button_padding">
<shape>
<solid a:color="@color/cpp_metro_button_light" />
<corners a:radius="@dimen/cpp_button_corner" />
</shape>
</inset>

14
android-app/src/main/res/drawable/metro_button_pressed.xml
View File

@@ -20,7 +20,13 @@
~ Site: http://se.solovyev.org
-->
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<solid a:color="#ff4d4d4d"/>
<corners a:radius="1dp"/>
</shape>
<inset xmlns:a="http://schemas.android.com/apk/res/android"
a:insetBottom="@dimen/cpp_button_padding"
a:insetLeft="@dimen/cpp_button_padding"
a:insetRight="@dimen/cpp_button_padding"
a:insetTop="@dimen/cpp_button_padding">
<shape>
<solid a:color="#ff4d4d4d" />
<corners a:radius="@dimen/cpp_button_corner" />
</shape>
</inset>

14
android-app/src/main/res/drawable/metro_button_purple_shape.xml
View File

@@ -20,7 +20,13 @@
~ Site: http://se.solovyev.org
-->
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<solid a:color="@color/cpp_metro_purple"/>
<corners a:radius="1dp"/>
</shape>
<inset xmlns:a="http://schemas.android.com/apk/res/android"
a:insetBottom="@dimen/cpp_button_padding"
a:insetLeft="@dimen/cpp_button_padding"
a:insetRight="@dimen/cpp_button_padding"
a:insetTop="@dimen/cpp_button_padding">
<shape>
<solid a:color="@color/cpp_metro_purple" />
<corners a:radius="@dimen/cpp_button_corner" />
</shape>
</inset>

2
android-app/src/main/res/drawable/pane_background.xml
View File

@@ -22,5 +22,5 @@
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<solid a:color="@color/cpp_pane_background"/>
<corners a:radius="1dp"/>
<corners a:radius="@dimen/cpp_button_corner"/>
</shape>

18
android-app/src/main/res/drawable/violet_button_dark_shape.xml
View File

@@ -22,10 +22,16 @@
~ Site: http://se.solovyev.org
-->
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<gradient
a:startColor="#2b0325"
<inset xmlns:a="http://schemas.android.com/apk/res/android"
a:insetBottom="@dimen/cpp_button_padding"
a:insetLeft="@dimen/cpp_button_padding"
a:insetRight="@dimen/cpp_button_padding"
a:insetTop="@dimen/cpp_button_padding">
<shape>
<gradient
a:angle="90"
a:endColor="#4f1c47"
a:angle="90"/>
<corners a:radius="0dp"/>
</shape>
a:startColor="#2b0325" />
<corners a:radius="0dp" />
</shape>
</inset>

18
android-app/src/main/res/drawable/violet_button_shape.xml
View File

@@ -22,10 +22,16 @@
~ Site: http://se.solovyev.org
-->
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<gradient
a:startColor="#520546"
<inset xmlns:a="http://schemas.android.com/apk/res/android"
a:insetBottom="@dimen/cpp_button_padding"
a:insetLeft="@dimen/cpp_button_padding"
a:insetRight="@dimen/cpp_button_padding"
a:insetTop="@dimen/cpp_button_padding">
<shape>
<gradient
a:angle="90"
a:endColor="#8a307c"
a:angle="90"/>
<corners a:radius="0dp"/>
</shape>
a:startColor="#520546" />
<corners a:radius="0dp" />
</shape>
</inset>