tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

2012-10-31 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* res/layout/options.xml,
	res/drawable/edittext_pandora_default_shape.xml,
	res/drawable/edittext_pandora_colors_states.xml,
	res/drawable/edittext_pandora_select_shape.xml,
	res/values/styles.xml: changed the style of options layout.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8988 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-10-31 12:56:38 +00:00
parent 8af1214b13
commit 8e437c6789
6 changed files with 137 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extras/pandroid_event_viewer/ChangeLog
View File

@ -1,3 +1,11 @@
2012-10-31 Miguel de Dios <miguel.dedios@artica.es>
* res/layout/options.xml,
res/drawable/edittext_pandora_default_shape.xml,
res/drawable/edittext_pandora_colors_states.xml,
res/drawable/edittext_pandora_select_shape.xml,
res/values/styles.xml: changed the style of options layout.
2012-10-30 Miguel de Dios <miguel.dedios@artica.es> 2012-10-30 Miguel de Dios <miguel.dedios@artica.es>
* res/layout/options.xml, res/values-ja/strings.xml, * res/layout/options.xml, res/values-ja/strings.xml,

14
extras/pandroid_event_viewer/res/drawable/edittext_pandora_colors_states.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- SELECT ALL FORMS -->
<item android:state_enabled="true" android:state_focused="true"
android:drawable="@drawable/edittext_pandora_select_shape" />
<!-- <item android:state_enabled="true"
android:drawable="@drawable/edittext_pandora_select_shape" /> -->
<item android:state_focused="true"
android:drawable="@drawable/edittext_pandora_select_shape" />
<!-- DEFAULT -->
<item
android:drawable="@drawable/edittext_pandora_default_shape" />
</selector>

10
extras/pandroid_event_viewer/res/drawable/edittext_pandora_default_shape.xml Normal file
View File

@ -0,0 +1,10 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<corners android:radius="2dp" />
<solid android:color="#F9F9F9" />
<padding android:right="20dp" />
<padding android:left="20dp" />
<padding android:top="20dp" />
<padding android:bottom="20dp" />
</shape>

12
extras/pandroid_event_viewer/res/drawable/edittext_pandora_select_shape.xml Normal file
View File

@ -0,0 +1,12 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<corners android:radius="2dp" />
<stroke android:width="4px" android:color="#79AD28"/>
<solid android:color="#F9F9F9" />
<padding android:right="20dp" />
<padding android:left="20dp" />
<padding android:top="20dp" />
<padding android:bottom="20dp" />
</shape>

134
extras/pandroid_event_viewer/res/layout/options.xml
View File

@ -58,7 +58,8 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textWebEditText" android:inputType="textWebEditText"
android:singleLine="true" /> android:singleLine="true"
style="@style/options_edittext"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -73,7 +74,8 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="text" android:inputType="text"
android:singleLine="true" /> android:singleLine="true"
style="@style/options_edittext" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -88,7 +90,8 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textPassword" android:inputType="textPassword"
android:singleLine="true" /> android:singleLine="true"
style="@style/options_edittext" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -103,7 +106,9 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textPassword" android:inputType="textPassword"
android:singleLine="true" /> android:singleLine="true"
style="@style/options_edittext"
/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -138,7 +143,8 @@
android:ems="3" android:ems="3"
android:inputType="number" android:inputType="number"
android:singleLine="true" android:singleLine="true"
android:gravity="right" /> android:gravity="right"
style="@style/options_edittext" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -148,6 +154,28 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
/> />
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|center_vertical"
android:paddingLeft="2dp"
android:text="@string/enable_background_service"
style="@style/options_label"
android:layout_weight="1"
/>
<CheckBox
android:id="@+id/background_service_on"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="0" />
</LinearLayout>
<TableLayout <TableLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -168,23 +196,6 @@
/> />
</TableRow> </TableRow>
<TableRow android:layout_marginTop="10dp" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|center_vertical"
android:paddingLeft="2dp"
android:text="@string/enable_background_service"
style="@style/options_label"
/>
<CheckBox
android:id="@+id/background_service_on"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />
</TableRow>
</TableLayout> </TableLayout>
</LinearLayout> </LinearLayout>
@ -194,7 +205,8 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:orientation="vertical" > android:orientation="vertical">
<TextView <TextView
style="@style/options_header" style="@style/options_header"
@ -202,57 +214,76 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:text="@string/notification" /> android:text="@string/notification" />
<TableLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_marginBottom="20dp"
android:stretchColumns="0,1" android:orientation="vertical"
android:padding="10dp"> android:padding="10dp">
<TableRow> <LinearLayout
android:layout_width="fill_parent"
<TextView android:layout_height="wrap_content"
android:orientation="horizontal"
>
<TextView
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/vibration" android:text="@string/vibration"
style="@style/options_label" /> style="@style/options_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"/>
<CheckBox <CheckBox
android:id="@+id/vibration_on" android:id="@+id/vibration_on"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" /> android:layout_gravity="center"
</TableRow> android:layout_weight="0" />
</LinearLayout>
<TableRow> <LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
>
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/led_flash" android:text="@string/led_flash"
style="@style/options_label" /> style="@style/options_label"
android:layout_weight="1" />
<CheckBox <CheckBox
android:id="@+id/led_flash_on" android:id="@+id/led_flash_on"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginRight="63dp" /> android:layout_weight="0" />
</TableRow> </LinearLayout>
<LinearLayout
<TableRow> android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
>
<TextView <TextView
android:id="@+id/textView1" android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/sound" android:text="@string/sound"
style="@style/options_label" /> style="@style/options_label"
android:layout_weight="1" />
<Button <Button
android:id="@+id/sound_button" android:id="@+id/sound_button"
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
</TableRow> android:layout_weight="0" />
</TableLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -270,5 +301,6 @@
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:text="@string/update_button_str" /> android:text="@string/update_button_str" />
</LinearLayout> </LinearLayout>
</LinearLayout>
</ScrollView> </ScrollView>

10
extras/pandroid_event_viewer/res/values/styles.xml
View File

@ -36,5 +36,15 @@
<item name="android:textSize">18dp</item> <item name="android:textSize">18dp</item>
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
</style> </style>
<style name="options_edittext">
<item name="android:textColor">#2C2C2C</item>
<item name="android:textSize">14dp</item>
<item name="android:padding">5dp</item>
<item name="android:background">@drawable/edittext_pandora_colors_states</item>
<item name="android:layout_marginTop">5dp</item>
<item name="android:layout_marginBottom">5dp</item>
</style>
</resources> </resources>