tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-11-06 Miguel de Dios <miguel.dedios@artica.es> 

* src/pandroid_event_viewer/pandorafms/About.java,
	res/values/styles.xml, res/layout/info.xml,
	res/drawable/btn_dropdown.xml,
	res/drawable/btn_dropdown_normal.9.png,
	res/drawable/round_dialog.xml, res/drawable/combobox_normal.9.png,
	AndroidManifest.xml: changes in th themes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9013 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-11-06 11:52:16 +00:00
parent 43570354c8
commit dcd2fa7231
9 changed files with 116 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/pandroid_event_viewer/AndroidManifest.xml
View File

@ -58,7 +58,7 @@
android:name=".About" android:name=".About"
android:configChanges="orientation|keyboardHidden" android:configChanges="orientation|keyboardHidden"
android:label="@string/pandroid_event_viewer_str" android:label="@string/pandroid_event_viewer_str"
android:theme="@android:style/Theme.Dialog" > android:theme="@style/Pandora_dialog" >
</activity> </activity>
<activity <activity
android:name=".PopupValidationEvent" android:name=".PopupValidationEvent"

9
extras/pandroid_event_viewer/ChangeLog
View File

@ -1,3 +1,12 @@
2013-11-06 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/About.java,
res/values/styles.xml, res/layout/info.xml,
res/drawable/btn_dropdown.xml,
res/drawable/btn_dropdown_normal.9.png,
res/drawable/round_dialog.xml, res/drawable/combobox_normal.9.png,
AndroidManifest.xml: changes in th themes.
2013-11-05 Miguel de Dios <miguel.dedios@artica.es> 2013-11-05 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/EventList.java, * src/pandroid_event_viewer/pandorafms/EventList.java,

10
extras/pandroid_event_viewer/res/drawable/btn_dropdown.xml
View File

@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_window_focused="false" android:state_enabled="true" android:drawable="@drawable/btn_dropdown_normal" /> <item android:state_window_focused="false" android:state_enabled="true"
android:drawable="@drawable/combobox_normal" />
<item android:state_pressed="true" android:drawable="@drawable/btn_dropdown_pressed" /> <item android:state_pressed="true" android:drawable="@drawable/btn_dropdown_pressed" />
<item android:state_focused="true" android:state_enabled="true" android:drawable="@drawable/btn_dropdown_pressed" /> <item android:state_focused="true" android:state_enabled="true"
<item android:state_enabled="true" android:drawable="@drawable/btn_dropdown_normal" /> android:drawable="@drawable/btn_dropdown_pressed" />
<item android:drawable="@drawable/btn_dropdown_normal" /> <item android:state_enabled="true" android:drawable="@drawable/combobox_normal" />
<item android:drawable="@drawable/combobox_normal" />
</selector> </selector>

BIN
extras/pandroid_event_viewer/res/drawable/btn_dropdown_normal.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.3 KiB

BIN
extras/pandroid_event_viewer/res/drawable/combobox_normal.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 405 B

13
extras/pandroid_event_viewer/res/drawable/round_dialog.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<corners android:radius="15dp" />
<solid android:color="#242424" />
<padding
android:bottom="15dp"
android:left="15dp"
android:right="15dp"
android:top="15dp" />
</shape>

127
extras/pandroid_event_viewer/res/layout/info.xml
View File

@ -14,55 +14,80 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
--> -->
<LinearLayout <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="wrap_content"
android:padding="10dip" android:layout_margin="15dp" >
>
<ImageView <LinearLayout
android:layout_weight="0" android:layout_width="fill_parent"
android:contentDescription="@string/pandorafms_logo_description" android:layout_height="fill_parent"
android:id="@+id/img_logo_about" android:orientation="vertical"
android:layout_width="wrap_content" android:padding="10dip" >
android:layout_height="wrap_content"
android:layout_gravity="center" <TextView
android:padding="5dp" style="@style/label_pandora"
android:src="@drawable/pandorafms_logo" android:layout_width="wrap_content"
/> android:layout_height="wrap_content"
<TextView android:gravity="center_horizontal"
android:layout_width="wrap_content" android:layout_gravity="center_horizontal"
android:layout_height="wrap_content" android:text="Pandroid Event Viewer"
android:text="@string/pandroid_info_txt" android:layout_marginBottom="30dp" />
/>
<TextView <ImageView
android:layout_width="wrap_content" android:id="@+id/img_logo_about"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:text="@string/pandroid_info_long_txt" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:layout_gravity="center"
/> android:layout_weight="0"
<TextView android:contentDescription="@string/pandorafms_logo_description"
android:id="@+id/url_pandora" android:padding="5dp"
android:layout_width="wrap_content" android:src="@drawable/pandorafms_logo"
android:layout_height="wrap_content" android:layout_marginBottom="10dp" />
android:gravity="center_horizontal"
/> <TextView
<LinearLayout android:layout_width="wrap_content"
android:orientation="horizontal" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:text="@string/pandroid_info_txt"
android:layout_height="wrap_content" android:gravity="center_horizontal"
> android:layout_marginBottom="10dp" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content" <TextView
android:text="@string/dont_show_again" android:layout_width="wrap_content"
android:layout_weight="2" android:layout_height="wrap_content"
/> android:gravity="center_horizontal"
<CheckBox android:text="@string/pandroid_info_long_txt"
android:id="@+id/dont_show_again_extended" android:layout_marginBottom="10dp" />
android:layout_width="wrap_content"
android:layout_height="wrap_content" <TextView
/> android:id="@+id/url_pandora"
</LinearLayout> android:layout_width="wrap_content"
</LinearLayout> android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="10dp" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_horizontal"
android:layout_gravity="center_horizontal">
<CheckBox
android:id="@+id/dont_show_again_extended"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:layout_marginLeft="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/dont_show_again" />
</LinearLayout>
</LinearLayout>
</ScrollView>

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

@ -5,8 +5,8 @@
<item name="android:layout_width">fill_parent</item> <item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:background">#D8D8D8</item> <item name="android:background">#D8D8D8</item>
<item name="android:paddingTop">2dp</item> <item name="android:paddingTop">4dp</item>
<item name="android:paddingBottom">2dp</item> <item name="android:paddingBottom">4dp</item>
<item name="android:paddingLeft">15dp</item> <item name="android:paddingLeft">15dp</item>
<item name="android:layout_marginBottom">5dp</item> <item name="android:layout_marginBottom">5dp</item>
<item name="android:textSize">12dp</item> <item name="android:textSize">12dp</item>
@ -45,5 +45,13 @@
<style name="background_pandora"> <style name="background_pandora">
<item name="android:background">#242424</item> <item name="android:background">#242424</item>
</style> </style>
<style name="Pandora_dialog" parent="@android:style/Theme.Dialog">
<item name="android:background">#242424</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowBackground">@drawable/round_dialog</item>
</style>
</resources> </resources>

2
extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/About.java
View File

@ -41,7 +41,7 @@ public class About extends Activity {
TextView text = (TextView) findViewById(R.id.url_pandora); TextView text = (TextView) findViewById(R.id.url_pandora);
text.setText(Html text.setText(Html
.fromHtml("<a href='http://pandorafms.org/'>PandoraFMS.org</a>")); .fromHtml("<a href='http://pandorafms.org/'>www.PandoraFMS.org</a>"));
text.setMovementMethod(LinkMovementMethod.getInstance()); text.setMovementMethod(LinkMovementMethod.getInstance());
CheckBox check_show = (CheckBox) findViewById(R.id.dont_show_again_extended); CheckBox check_show = (CheckBox) findViewById(R.id.dont_show_again_extended);