eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-03 01:29:33 +00:00
Code Activity

RCApp: new styled button (does not change with theme yet) and not everywhere included yet

Browse Source
This commit is contained in:
Peter Siegmund committed 2015-03-24 10:27:28 +01:00
1 parent 34fbccd481
commit c062da58bd
9 files changed
+108 -65
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.racecommittee.app/res/drawable/button_dark.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- pressed -->
<item android:drawable="@color/constant_sap_yellow_1" android:state_pressed="true"/>
<!-- focused -->
<item android:drawable="@color/constant_white" android:state_focused="true"/>
<!-- disabled -->
<item android:drawable="@color/dark_sap_gray_white_10" android:state_enabled="false"/>
<!-- default -->
<item android:drawable="@color/constant_white"/>
</selector>
mobile/com.sap.sailing.racecommittee.app/res/drawable/button_light.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- pressed -->
<item android:drawable="@color/light_sap_gray_black_40" android:state_pressed="true"/>
<!-- focused -->
<item android:drawable="@color/light_sap_gray_black_40" android:state_focused="true"/>
<!-- disabled -->
<item android:drawable="@color/light_sap_gray_white_10" android:state_enabled="false"/>
<!-- default -->
<item android:drawable="@color/light_sap_gray_black_40"/>
</selector>
mobile/com.sap.sailing.racecommittee.app/res/layout/login_listviews.xml
+19 -1
View File
@@ -153,5 +153,23 @@
android:layout_below="@id/position_line"
android:background="@color/constant_black_light" />
<include layout="@layout/signup_button" />
<Button
android:id="@+id/login_submit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="@dimen/default_margin_twice"
android:layout_marginEnd="@dimen/default_margin_twice"
android:layout_marginRight="@dimen/default_margin_twice"
android:enabled="false"
android:paddingLeft="@dimen/default_padding"
android:paddingRight="@dimen/default_padding"
android:text="@string/sign_up"
android:textAllCaps="true"
android:textSize="@dimen/textSize_26"
android:textStyle="bold"
android:visibility="visible"
style="@style/AppTheme.Dark.Button"/>
</RelativeLayout>
mobile/com.sap.sailing.racecommittee.app/res/layout/race_schedule_start_time.xml
+43 -39
View File
@@ -36,49 +36,54 @@
</LinearLayout>
</RelativeLayout>
<TextView
android:id="@+id/start_countdown"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginEnd="@dimen/default_margin_twice"
android:layout_marginRight="@dimen/default_margin_twice"
android:layout_marginTop="@dimen/default_margin"
tools:text="@string/race_start_time_in"
android:textColor="?white"
android:textSize="@dimen/textSize_40"
android:visibility="visible" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/selector_header_height">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/default_margin_half"
android:orientation="horizontal">
<Button
android:id="@+id/start_min_five"
<TextView
android:id="@+id/start_countdown"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/default_padding"
android:tag="5"
android:text="@string/race_start_in_5_minutes"
android:textAllCaps="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginEnd="@dimen/default_margin_twice"
android:layout_marginRight="@dimen/default_margin_twice"
tools:text="@string/race_start_time_in"
android:textColor="?white"
android:textSize="@dimen/textSize_22" />
android:textSize="@dimen/textSize_40"
android:visibility="visible"
android:layout_centerVertical="true" />
<Button
android:id="@+id/start_min_one"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/default_padding"
android:tag="1"
android:text="@string/race_start_in_1_minute"
android:textAllCaps="true"
android:textColor="?white"
android:textSize="@dimen/textSize_22" />
</LinearLayout>
android:layout_marginTop="@dimen/default_margin_half"
android:orientation="horizontal"
android:layout_centerInParent="true">
<Button
android:id="@+id/start_min_five"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/default_padding"
android:tag="5"
android:text="@string/race_start_in_5_minutes"
android:textAllCaps="true"
android:textColor="?white"
android:textSize="@dimen/textSize_22" />
<Button
android:id="@+id/start_min_one"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/default_padding"
android:tag="1"
android:text="@string/race_start_in_1_minute"
android:textAllCaps="true"
android:textColor="?white"
android:textSize="@dimen/textSize_22" />
</LinearLayout>
</RelativeLayout>
<View
android:id="@+id/line_top"
@@ -122,12 +127,11 @@
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:layout_margin="@dimen/default_margin_twice"
android:background="?sap_blue_1"
android:padding="@dimen/default_padding"
android:text="@string/race_set_start"
android:textAllCaps="true"
android:textColor="?white"
android:textSize="@dimen/textSize_22"
android:textStyle="bold" />
android:textStyle="bold"
style="@style/AppTheme.Dark.Button"/>
</RelativeLayout>
</RelativeLayout>
mobile/com.sap.sailing.racecommittee.app/res/layout/signup_button.xml
-21
View File
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Button xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/login_submit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="@dimen/default_margin_twice"
android:layout_marginEnd="@dimen/default_margin_twice"
android:layout_marginRight="@dimen/default_margin_twice"
android:background="?sap_blue_1"
android:enabled="false"
android:paddingLeft="@dimen/default_padding"
android:paddingRight="@dimen/default_padding"
android:text="@string/sign_up"
android:textAllCaps="true"
android:textColor="?white"
android:textSize="@dimen/textSize_26"
android:textStyle="bold"
android:visibility="visible" />
mobile/com.sap.sailing.racecommittee.app/res/values-v21/themes_dark.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<item name="android:alertDialogTheme">@style/AppTheme.Dark.AlertDialog</item>
</style>
<style name="AppTheme.Dark.AlertDialog" parent="Theme.AppCompat.Light.Dialog">
<style name="AppTheme.Dark.AlertDialog" parent="Theme.AppCompat.Dialog">
<item name="android:colorPrimary">@color/dark_colorPrimary</item>
<item name="android:colorPrimaryDark">@color/dark_colorPrimaryDark</item>
<item name="android:colorAccent">@color/dark_colorAccent</item>
mobile/com.sap.sailing.racecommittee.app/res/values/themes_dark.xml
+5
View File
@@ -36,4 +36,9 @@
<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>
</style>
</resources>
mobile/com.sap.sailing.racecommittee.app/res/values/themes_light.xml
+5
View File
@@ -36,4 +36,9 @@
<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>
</style>
</resources>
mobile/com.sap.sailing.racecommittee.app/res/xml/preference_general.xml
+3 -3
View File
@@ -63,17 +63,17 @@
android:key="@string/preference_wakelock_key"
android:summary="@string/preference_wakelock_summary"
android:title="@string/preference_wakelock_header" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/settings_category_developer"
android:key="@string/preference_developer_key">
<ListPreference
android:key="@string/preference_theme_key"
android:title="@string/preference_theme_header"
android:defaultValue="@string/preference_theme_default"
android:entries="@array/preference_theme_entries"
android:entryValues="@array/preference_theme_values"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/settings_category_developer"
android:key="@string/preference_developer_key">
<CheckBoxPreference
android:defaultValue="@bool/preference_offline_default"
android:key="@string/preference_offline_key"