eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-30 01:16:40 +00:00
Code Activity

login screen now has rounded button horizontal centered (on phone)

Browse Source
This commit is contained in:
Peter Siegmund
2015-08-21 10:21:38 +02:00
parent d2c6bfe118
commit 8a123432b2
15 changed files with 115 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.racecommittee.app/res/drawable/button_dark.xml
+4 -4
View File
@@ -2,15 +2,15 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- pressed -->
<item android:drawable="@color/constant_sap_yellow_1" android:state_pressed="true" />
<item android:drawable="@drawable/button_dark_pressed" android:state_pressed="true" />
<!-- focused -->
<item android:drawable="@color/constant_white" android:state_focused="true" />
<item android:drawable="@drawable/button_dark_default" android:state_focused="true" />
<!-- disabled -->
<item android:drawable="@color/dark_sap_gray_white_10" android:state_enabled="false" />
<item android:drawable="@drawable/button_dark_disabled" android:state_enabled="false" />
<!-- default -->
<item android:drawable="@color/constant_white" />
<item android:drawable="@drawable/button_dark_default" />
</selector>
mobile/com.sap.sailing.racecommittee.app/res/drawable/button_dark_default.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/constant_white"/>
<corners android:radius="@dimen/default_button_radius"/>
</shape>
mobile/com.sap.sailing.racecommittee.app/res/drawable/button_dark_disabled.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/dark_sap_gray_white_10"/>
<corners android:radius="@dimen/default_button_radius"/>
</shape>
mobile/com.sap.sailing.racecommittee.app/res/drawable/button_dark_pressed.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/constant_sap_yellow_1"/>
<corners android:radius="@dimen/default_button_radius"/>
</shape>
mobile/com.sap.sailing.racecommittee.app/res/drawable/button_filled_bordered_dark.xml
+2 -2
View File
@@ -11,7 +11,7 @@
android:color="@color/dark_sap_gray_white_10"/>
<corners
android:radius="0dp"/>
android:radius="@dimen/default_button_radius"/>
</shape>
</item>
@@ -26,7 +26,7 @@
android:color="@color/dark_sap_gray_white_10"/>
<corners
android:radius="0dp"/>
android:radius="@dimen/default_button_radius"/>
</shape>
</item>
</selector>
mobile/com.sap.sailing.racecommittee.app/res/drawable/button_filled_bordered_light.xml
+2 -2
View File
@@ -11,7 +11,7 @@
android:color="@color/dark_sap_gray_white_10"/>
<corners
android:radius="0dp"/>
android:radius="@dimen/default_button_radius"/>
</shape>
</item>
@@ -26,7 +26,7 @@
android:color="@color/dark_sap_gray_white_10"/>
<corners
android:radius="0dp"/>
android:radius="@dimen/default_button_radius"/>
</shape>
</item>
</selector>
mobile/com.sap.sailing.racecommittee.app/res/drawable/button_light.xml
+4 -4
View File
@@ -2,15 +2,15 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- pressed -->
<item android:drawable="@color/constant_sap_yellow_1" android:state_pressed="true" />
<item android:drawable="@drawable/button_light_pressed" android:state_pressed="true" />
<!-- focused -->
<item android:drawable="@color/light_sap_gray_black_40" android:state_focused="true" />
<item android:drawable="@drawable/button_light_default" android:state_focused="true" />
<!-- disabled -->
<item android:drawable="@color/light_sap_gray_white_10" android:state_enabled="false" />
<item android:drawable="@drawable/button_light_disabled" android:state_enabled="false" />
<!-- default -->
<item android:drawable="@color/light_sap_gray_black_40" />
<item android:drawable="@drawable/button_light_default" />
</selector>
mobile/com.sap.sailing.racecommittee.app/res/drawable/button_light_default.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/light_sap_gray_black_40"/>
<corners android:radius="@dimen/default_button_radius"/>
</shape>
mobile/com.sap.sailing.racecommittee.app/res/drawable/button_light_disabled.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/light_sap_gray_white_10"/>
<corners android:radius="@dimen/default_button_radius"/>
</shape>
mobile/com.sap.sailing.racecommittee.app/res/drawable/button_light_pressed.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/constant_sap_yellow_1"/>
<corners android:radius="@dimen/default_button_radius"/>
</shape>
mobile/com.sap.sailing.racecommittee.app/res/layout/login_listviews.xml
+6 -7
View File
@@ -187,15 +187,14 @@
<Button
android:id="@+id/login_submit"
style="?attr/buttonSolidNormal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?attr/button"
android:layout_width="@dimen/default_button_width"
android:layout_height="@dimen/default_button_height"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin"
android:enabled="false"
android:text="@string/sign_up"
android:textSize="@dimen/textSize_26"
android:visibility="visible"/>
android:textSize="@dimen/textSize_18"
android:textStyle="normal"/>
</RelativeLayout>
mobile/com.sap.sailing.racecommittee.app/res/values/attr.xml
+1
View File
@@ -17,6 +17,7 @@
<attr name="white_invert" format="color"/>
<!-- custom references (e.g. styles) -->
<attr name="button" format="reference"/>
<attr name="buttonSolidXSmall" format="reference"/>
<attr name="buttonSolidSmall" format="reference"/>
<attr name="buttonSolidNormal" format="reference"/>
mobile/com.sap.sailing.racecommittee.app/res/values/dimens.xml
+4
View File
@@ -32,6 +32,10 @@
<dimen name="setup_text_width">150dp</dimen>
<dimen name="default_button_height">40dp</dimen>
<dimen name="default_button_width">216dp</dimen>
<dimen name="default_button_radius">2dp</dimen>
<dimen name="default_padding_half">12dp</dimen>
<dimen name="default_padding">24dp</dimen>
<dimen name="default_padding_twice">48dp</dimen>
mobile/com.sap.sailing.racecommittee.app/res/values/themes_dark.xml
+22 -14
View File
@@ -32,6 +32,7 @@
<item name="white_invert">@color/constant_black</item>
<!-- styles -->
<item name="button">@style/AppTheme.Dark.Button</item>
<item name="buttonSolidXSmall">@style/AppTheme.Dark.Button.XSmall</item>
<item name="buttonSolidSmall">@style/AppTheme.Dark.Button.Small</item>
<item name="buttonSolidNormal">@style/AppTheme.Dark.Button.Normal</item>
@@ -104,17 +105,6 @@
<item name="spinBars">false</item>
</style>
<style name="AppTheme.Dark.Button">
<item name="android:textColor">@color/constant_black</item>
<item name="android:background">@drawable/button_dark</item>
<item name="android:textStyle">bold</item>
<item name="android:textAllCaps">true</item>
<item name="android:paddingTop">@dimen/default_padding_half</item>
<item name="android:paddingRight">@dimen/default_padding</item>
<item name="android:paddingBottom">@dimen/default_padding_half</item>
<item name="android:paddingLeft">@dimen/default_padding</item>
</style>
<!-- custom styles -->
<style name="AppTheme.Dark.EditText" parent="android:Widget.EditText">
<item name="android:background">@drawable/edit_text_dark</item>
@@ -122,15 +112,33 @@
<item name="android:textColorHint">?sap_light_gray</item>
</style>
<style name="AppTheme.Dark.Button.XSmall">
<style name="AppTheme.Dark.Button">
<item name="android:textColor">@color/constant_black</item>
<item name="android:background">@drawable/button_dark</item>
<item name="android:textAllCaps">true</item>
<item name="android:bottomRightRadius">@dimen/default_button_radius</item>
<item name="android:bottomLeftRadius">@dimen/default_button_radius</item>
<item name="android:topRightRadius">@dimen/default_button_radius</item>
<item name="android:topLeftRadius">@dimen/default_button_radius</item>
</style>
<style name="AppTheme.Dark.Button.Default">
<item name="android:textStyle">bold</item>
<item name="android:paddingTop">@dimen/default_padding_half</item>
<item name="android:paddingRight">@dimen/default_padding</item>
<item name="android:paddingBottom">@dimen/default_padding_half</item>
<item name="android:paddingLeft">@dimen/default_padding</item>
</style>
<style name="AppTheme.Dark.Button.XSmall" parent="AppTheme.Dark.Button.Default">
<item name="android:textSize">@dimen/textSize_18</item>
</style>
<style name="AppTheme.Dark.Button.Small">
<style name="AppTheme.Dark.Button.Small" parent="AppTheme.Dark.Button.Default">
<item name="android:textSize">@dimen/textSize_22</item>
</style>
<style name="AppTheme.Dark.Button.Normal">
<style name="AppTheme.Dark.Button.Normal" parent="AppTheme.Dark.Button.Default">
<item name="android:textSize">@dimen/textSize_26</item>
</style>
mobile/com.sap.sailing.racecommittee.app/res/values/themes_light.xml
+22 -14
View File
@@ -41,6 +41,7 @@
<item name="white_invert">@color/constant_white</item>
<!-- styles -->
<item name="button">@style/AppTheme.Light.Button</item>
<item name="buttonSolidXSmall">@style/AppTheme.Light.Button.XSmall</item>
<item name="buttonSolidSmall">@style/AppTheme.Light.Button.Small</item>
<item name="buttonSolidNormal">@style/AppTheme.Light.Button.Normal</item>
@@ -125,17 +126,6 @@
<item name="spinBars">false</item>
</style>
<style name="AppTheme.Light.Button">
<item name="android:textColor">@color/constant_white</item>
<item name="android:background">@drawable/button_light</item>
<item name="android:textStyle">bold</item>
<item name="android:textAllCaps">true</item>
<item name="android:paddingTop">@dimen/default_padding_half</item>
<item name="android:paddingRight">@dimen/default_padding</item>
<item name="android:paddingBottom">@dimen/default_padding_half</item>
<item name="android:paddingLeft">@dimen/default_padding</item>
</style>
<!-- custom styles -->
<style name="AppTheme.Light.EditText" parent="android:Widget.EditText">
<item name="android:background">@drawable/edit_text_light</item>
@@ -143,15 +133,33 @@
<item name="android:textColorHint">?sap_light_gray</item>
</style>
<style name="AppTheme.Light.Button.XSmall">
<style name="AppTheme.Light.Button">
<item name="android:textColor">@color/constant_white</item>
<item name="android:background">@drawable/button_light</item>
<item name="android:textAllCaps">true</item>
<item name="android:bottomRightRadius">@dimen/default_button_radius</item>
<item name="android:bottomLeftRadius">@dimen/default_button_radius</item>
<item name="android:topRightRadius">@dimen/default_button_radius</item>
<item name="android:topLeftRadius">@dimen/default_button_radius</item>
</style>
<style name="AppTheme.Light.Button.Default">
<item name="android:textStyle">bold</item>
<item name="android:paddingTop">@dimen/default_padding_half</item>
<item name="android:paddingRight">@dimen/default_padding</item>
<item name="android:paddingBottom">@dimen/default_padding_half</item>
<item name="android:paddingLeft">@dimen/default_padding</item>
</style>
<style name="AppTheme.Light.Button.XSmall" parent="AppTheme.Light.Button.Default">
<item name="android:textSize">@dimen/textSize_18</item>
</style>
<style name="AppTheme.Light.Button.Small">
<style name="AppTheme.Light.Button.Small" parent="AppTheme.Light.Button.Default">
<item name="android:textSize">@dimen/textSize_22</item>
</style>
<style name="AppTheme.Light.Button.Normal">
<style name="AppTheme.Light.Button.Normal" parent="AppTheme.Light.Button.Default">
<item name="android:textSize">@dimen/textSize_26</item>
</style>