tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* src/pandroid_event_viewer/pandorafms/EventList.java,
	res/layout/item_list_event_layout.xml,
	res/layout/list_view_layout.xml, res/drawable/round_event_item.xml,
	res/drawable/round_event_item_blue.xml,
	res/drawable/round_event_item_green.xml,
	res/drawable/round_event_item_grey.xml,
	res/drawable/round_event_item_red.xml,
	res/drawable/round_event_item_yellow.xml: changes in the themes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9017 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-11-06 15:40:00 +00:00
parent 087410661b
commit 7597d332bd
10 changed files with 131 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
extras/pandroid_event_viewer/ChangeLog
View File

@ -1,3 +1,14 @@
2013-11-06 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/EventList.java,
res/layout/item_list_event_layout.xml,
res/layout/list_view_layout.xml, res/drawable/round_event_item.xml,
res/drawable/round_event_item_blue.xml,
res/drawable/round_event_item_green.xml,
res/drawable/round_event_item_grey.xml,
res/drawable/round_event_item_red.xml,
res/drawable/round_event_item_yellow.xml: changes in the themes.
2013-11-06 Miguel de Dios <miguel.dedios@artica.es> 2013-11-06 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/About.java, * src/pandroid_event_viewer/pandorafms/About.java,

6
extras/pandroid_event_viewer/res/drawable/round_event_item.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#FFFFFF"/>
<stroke android:width="3dip" android:color="#242424" />
<corners android:radius="5dip"/>
</shape>

6
extras/pandroid_event_viewer/res/drawable/round_event_item_blue.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#ffffff"/>
<stroke android:width="3dip" android:color="#242424" />
<corners android:radius="5dip"/>
</shape>

6
extras/pandroid_event_viewer/res/drawable/round_event_item_green.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#7eb628"/>
<stroke android:width="3dip" android:color="#242424" />
<corners android:radius="5dip"/>
</shape>

6
extras/pandroid_event_viewer/res/drawable/round_event_item_grey.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#ffffff"/>
<stroke android:width="3dip" android:color="#242424" />
<corners android:radius="5dip"/>
</shape>

6
extras/pandroid_event_viewer/res/drawable/round_event_item_red.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#ff4040"/>
<stroke android:width="3dip" android:color="#242424" />
<corners android:radius="5dip"/>
</shape>

6
extras/pandroid_event_viewer/res/drawable/round_event_item_yellow.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#f2d400"/>
<stroke android:width="3dip" android:color="#242424" />
<corners android:radius="5dip"/>
</shape>

19
extras/pandroid_event_viewer/res/layout/item_list_event_layout.xml
View File

@ -18,16 +18,16 @@
android:id="@+id/item_linear_layout" android:id="@+id/item_linear_layout"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" > android:orientation="vertical"
android:background="#242424">
<RelativeLayout <RelativeLayout
android:id="@+id/content_event_item" android:id="@+id/content_event_item"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="2dp" android:padding="5dp"
android:layout_marginRight="2dp" android:background="#242424"
android:layout_marginTop="1dp" >
android:layout_marginBottom="1dp" >
<TextView <TextView
android:id="@+id/event_name" android:id="@+id/event_name"
@ -35,13 +35,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:textColor="#000" android:textColor="#000"
android:textColorHighlight="#000" /> android:textColorHighlight="#000"
android:layout_margin="5dp" />
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/event_name" android:layout_below="@id/event_name"
android:orientation="horizontal" > android:orientation="horizontal"
android:layout_margin="5dp" >
<TextView <TextView
android:id="@+id/agent_name" android:id="@+id/agent_name"
@ -61,7 +63,8 @@
android:drawablePadding="10dp" android:drawablePadding="10dp"
android:textColor="#000" android:textColor="#000"
android:textColorHighlight="#000" android:textColorHighlight="#000"
android:textSize="10sp" /> android:textSize="10sp"
android:paddingRight="5dp" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

81
extras/pandroid_event_viewer/res/layout/list_view_layout.xml
View File

@ -20,6 +20,7 @@
android:orientation="vertical" > android:orientation="vertical" >
<!-- BEGIN THE HEADER --> <!-- BEGIN THE HEADER -->
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -63,51 +64,59 @@
android:padding="0dp" android:padding="0dp"
android:src="@drawable/filter_icon" /> android:src="@drawable/filter_icon" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="fill_parent" <LinearLayout
android:layout_height="2px" android:layout_width="fill_parent"
android:background="#6D9624" /> android:layout_height="2px"
android:background="#6D9624" />
<!-- END THE HEADER --> <!-- END THE HEADER -->
<LinearLayout <LinearLayout
android:id="@+id/loading_layout" android:layout_width="fill_parent"
android:layout_width="wrap_content" android:layout_height="fill_parent"
android:layout_height="wrap_content" android:padding="8dp"
android:orientation="horizontal" > android:background="#242424" >
<ProgressBar <LinearLayout
style="?android:attr/progressBarStyleSmall" android:id="@+id/loading_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingRight="10dip" /> android:orientation="horizontal" >
<TextView <ProgressBar
style="?android:attr/progressBarStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dip" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/loading_label_str"
android:textColor="#ffffff"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/empty_list_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone" >
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/empty_label_str"
android:textColor="#ffffff"
android:textStyle="bold" />
</LinearLayout>
<ListView
android:id="@id/android:list"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/loading_label_str" android:fadingEdge="none" />
android:textColor="#ffffff"
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/empty_list_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone" >
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/empty_label_str"
android:textColor="#ffffff"
android:textStyle="bold" />
</LinearLayout>
<ListView
android:id="@id/android:list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:fadingEdge="none" />
</LinearLayout> </LinearLayout>

43
extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java
View File

@ -423,30 +423,39 @@ public class EventList extends ListActivity {
else { else {
final EventListItem item = this.object.eventList.get(position); final EventListItem item = this.object.eventList.get(position);
switch (item.criticity) { switch (item.criticity) {
case 0: case 0:
view.setBackgroundColor(getResources().getColor( view.findViewById(R.id.content_event_item).setBackgroundResource(
R.color.Blue)); R.drawable.round_event_item_blue
);
break; break;
case 1: case 1:
view.setBackgroundColor(getResources().getColor( view.findViewById(R.id.content_event_item).setBackgroundResource(
R.color.Grey)); R.drawable.round_event_item_grey
);
break; break;
case 2: case 2:
view.setBackgroundColor(getResources().getColor( view.findViewById(R.id.content_event_item).setBackgroundResource(
R.color.Green)); R.drawable.round_event_item_green
);
break; break;
case 3: case 3:
view.setBackgroundColor(getResources().getColor( view.findViewById(R.id.content_event_item).setBackgroundResource(
R.color.Yellow)); R.drawable.round_event_item_yellow
);
break; break;
case 4: case 4:
view.setBackgroundColor(getResources() view.findViewById(R.id.content_event_item).setBackgroundResource(
.getColor(R.color.Red)); R.drawable.round_event_item_red
);
break; break;
default: default:
view.setBackgroundColor(getResources().getColor( view.findViewById(R.id.content_event_item).setBackgroundResource(
R.color.Grey)); R.drawable.round_event_item_grey
);
break; break;
} }
@ -467,11 +476,11 @@ public class EventList extends ListActivity {
.findViewById(R.id.timestamp); .findViewById(R.id.timestamp);
timestamp.setText(item.timestamp); timestamp.setText(item.timestamp);
if (item.criticity_image.length() != 0) // if (item.criticity_image.length() != 0)
Core.setTextViewLeftImage((TextView) view // Core.setTextViewLeftImage((TextView) view
.findViewById(R.id.event_name), Core // .findViewById(R.id.event_name), Core
.getSeverityImage(getApplicationContext(), // .getSeverityImage(getApplicationContext(),
item.criticity), 16); // item.criticity), 16);
if (item.status == 1) { if (item.status == 1) {
Core.setTextViewLeftImage(timestamp, getResources() Core.setTextViewLeftImage(timestamp, getResources()