diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog index f68f4e1628..5e50db829f 100644 --- a/extras/pandroid_event_viewer/ChangeLog +++ b/extras/pandroid_event_viewer/ChangeLog @@ -1,3 +1,14 @@ +2013-11-06 Miguel de Dios + + * 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 * src/pandroid_event_viewer/pandorafms/About.java, diff --git a/extras/pandroid_event_viewer/res/drawable/round_event_item.xml b/extras/pandroid_event_viewer/res/drawable/round_event_item.xml new file mode 100644 index 0000000000..893e52f4a3 --- /dev/null +++ b/extras/pandroid_event_viewer/res/drawable/round_event_item.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/extras/pandroid_event_viewer/res/drawable/round_event_item_blue.xml b/extras/pandroid_event_viewer/res/drawable/round_event_item_blue.xml new file mode 100644 index 0000000000..0446e4fbf6 --- /dev/null +++ b/extras/pandroid_event_viewer/res/drawable/round_event_item_blue.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/extras/pandroid_event_viewer/res/drawable/round_event_item_green.xml b/extras/pandroid_event_viewer/res/drawable/round_event_item_green.xml new file mode 100644 index 0000000000..34214ad096 --- /dev/null +++ b/extras/pandroid_event_viewer/res/drawable/round_event_item_green.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/extras/pandroid_event_viewer/res/drawable/round_event_item_grey.xml b/extras/pandroid_event_viewer/res/drawable/round_event_item_grey.xml new file mode 100644 index 0000000000..0446e4fbf6 --- /dev/null +++ b/extras/pandroid_event_viewer/res/drawable/round_event_item_grey.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/extras/pandroid_event_viewer/res/drawable/round_event_item_red.xml b/extras/pandroid_event_viewer/res/drawable/round_event_item_red.xml new file mode 100644 index 0000000000..15c4cc96e9 --- /dev/null +++ b/extras/pandroid_event_viewer/res/drawable/round_event_item_red.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/extras/pandroid_event_viewer/res/drawable/round_event_item_yellow.xml b/extras/pandroid_event_viewer/res/drawable/round_event_item_yellow.xml new file mode 100644 index 0000000000..07e2edaf5e --- /dev/null +++ b/extras/pandroid_event_viewer/res/drawable/round_event_item_yellow.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/extras/pandroid_event_viewer/res/layout/item_list_event_layout.xml b/extras/pandroid_event_viewer/res/layout/item_list_event_layout.xml index 25da988b2d..6f9568c3ad 100644 --- a/extras/pandroid_event_viewer/res/layout/item_list_event_layout.xml +++ b/extras/pandroid_event_viewer/res/layout/item_list_event_layout.xml @@ -18,16 +18,16 @@ android:id="@+id/item_linear_layout" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical" > + android:orientation="vertical" + android:background="#242424"> + android:padding="5dp" + android:background="#242424" + > + android:textColorHighlight="#000" + android:layout_margin="5dp" /> + android:orientation="horizontal" + android:layout_margin="5dp" > + android:textSize="10sp" + android:paddingRight="5dp" /> diff --git a/extras/pandroid_event_viewer/res/layout/list_view_layout.xml b/extras/pandroid_event_viewer/res/layout/list_view_layout.xml index 7a58a2af24..60d91a009c 100644 --- a/extras/pandroid_event_viewer/res/layout/list_view_layout.xml +++ b/extras/pandroid_event_viewer/res/layout/list_view_layout.xml @@ -20,6 +20,7 @@ android:orientation="vertical" > + - + - + - + + + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:padding="8dp" + android:background="#242424" > - + android:orientation="horizontal" > - + + + + + + + + + + + android:fadingEdge="none" /> - - - - - - - \ No newline at end of file diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java index 790756448c..1f83267d13 100644 --- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java +++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java @@ -423,30 +423,39 @@ public class EventList extends ListActivity { else { final EventListItem item = this.object.eventList.get(position); + + + switch (item.criticity) { case 0: - view.setBackgroundColor(getResources().getColor( - R.color.Blue)); + view.findViewById(R.id.content_event_item).setBackgroundResource( + R.drawable.round_event_item_blue + ); break; case 1: - view.setBackgroundColor(getResources().getColor( - R.color.Grey)); + view.findViewById(R.id.content_event_item).setBackgroundResource( + R.drawable.round_event_item_grey + ); break; case 2: - view.setBackgroundColor(getResources().getColor( - R.color.Green)); + view.findViewById(R.id.content_event_item).setBackgroundResource( + R.drawable.round_event_item_green + ); break; case 3: - view.setBackgroundColor(getResources().getColor( - R.color.Yellow)); + view.findViewById(R.id.content_event_item).setBackgroundResource( + R.drawable.round_event_item_yellow + ); break; case 4: - view.setBackgroundColor(getResources() - .getColor(R.color.Red)); + view.findViewById(R.id.content_event_item).setBackgroundResource( + R.drawable.round_event_item_red + ); break; default: - view.setBackgroundColor(getResources().getColor( - R.color.Grey)); + view.findViewById(R.id.content_event_item).setBackgroundResource( + R.drawable.round_event_item_grey + ); break; } @@ -467,11 +476,11 @@ public class EventList extends ListActivity { .findViewById(R.id.timestamp); timestamp.setText(item.timestamp); - if (item.criticity_image.length() != 0) - Core.setTextViewLeftImage((TextView) view - .findViewById(R.id.event_name), Core - .getSeverityImage(getApplicationContext(), - item.criticity), 16); +// if (item.criticity_image.length() != 0) +// Core.setTextViewLeftImage((TextView) view +// .findViewById(R.id.event_name), Core +// .getSeverityImage(getApplicationContext(), +// item.criticity), 16); if (item.status == 1) { Core.setTextViewLeftImage(timestamp, getResources()