From d7dd37f562ff317c0bf12ad9d2781900c05e07c3 Mon Sep 17 00:00:00 2001
From: Alejandro Gallardo Escobar <alejandro.gallardo@artica.es>
Date: Thu, 2 Nov 2017 17:59:29 +0100
Subject: [PATCH] [Android Event Viewer] Added a button to access the settings
 and improved the behaviour of the filter button

---
 .../pandorafms/EventList.java                 | 10 ++++++++--
 .../pandorafms/Main.java                      | 19 +++++++++++++++++++
 .../src/main/res/layout/list_view_layout.xml  | 16 +++++++++++++++-
 .../app/src/main/res/layout/main.xml          | 15 +++++++++++++++
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/extras/android-event-viewer/app/src/main/java/pandroid_event_viewer/pandorafms/EventList.java b/extras/android-event-viewer/app/src/main/java/pandroid_event_viewer/pandorafms/EventList.java
index 15ca771bad..b208855e0b 100644
--- a/extras/android-event-viewer/app/src/main/java/pandroid_event_viewer/pandorafms/EventList.java
+++ b/extras/android-event-viewer/app/src/main/java/pandroid_event_viewer/pandorafms/EventList.java
@@ -159,8 +159,14 @@ public class EventList extends ListActivity {
 			}
 		});
 
-		
-		
+		ImageButton btnSettings = (ImageButton) findViewById(R.id.settings_icon_button_list);
+		// Open the settings
+		btnSettings.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View v) {
+				startActivity(new Intent(v.getContext(), Options.class));
+			}
+		});
+
 		registerReceiver(onBroadcast, new IntentFilter("eventlist.java"));
 
 		this.toggleLoadingLayout();
diff --git a/extras/android-event-viewer/app/src/main/java/pandroid_event_viewer/pandorafms/Main.java b/extras/android-event-viewer/app/src/main/java/pandroid_event_viewer/pandorafms/Main.java
index 6ab57371e9..2548b8023b 100644
--- a/extras/android-event-viewer/app/src/main/java/pandroid_event_viewer/pandorafms/Main.java
+++ b/extras/android-event-viewer/app/src/main/java/pandroid_event_viewer/pandorafms/Main.java
@@ -96,10 +96,29 @@ public class Main extends Activity {
 			Activity.MODE_PRIVATE);
 
 		setContentView(R.layout.main);
+		final ImageButton btnSettings = (ImageButton) findViewById(R.id.settings_icon_button_main);
+		final ImageButton btnFilter = (ImageButton) findViewById(R.id.filter_icon_button_main);
 		final Button buttonSetAsFilterWatcher = (Button) findViewById(R.id.button_set_as_filter_watcher);
 		final ImageButton buttonSearch = (ImageButton) findViewById(R.id.refresh_icon_button_main);
 		final ImageButton buttonDeleteProfile = (ImageButton) findViewById(R.id.button_delete_profile);
 		final ImageButton buttonSaveProfile = (ImageButton) findViewById(R.id.button_save_profile);
+
+		// Open the settings
+		btnSettings.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View v) {
+				startActivity(new Intent(v.getContext(), Options.class));
+			}
+		});
+
+		// Go to the events list
+		btnFilter.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View v) {
+				Activity a = (Activity) v.getContext();
+				TabActivity ta = (TabActivity) a.getParent();
+				ta.getTabHost().setCurrentTab(1);
+			}
+		});
+
 		// Check if the user preferences it is set.
 		if (object.user.length() == 0 || object.password.length() == 0
 				|| object.url.length() == 0) {
diff --git a/extras/android-event-viewer/app/src/main/res/layout/list_view_layout.xml b/extras/android-event-viewer/app/src/main/res/layout/list_view_layout.xml
index 9b32dfe1dc..b0135b4489 100644
--- a/extras/android-event-viewer/app/src/main/res/layout/list_view_layout.xml
+++ b/extras/android-event-viewer/app/src/main/res/layout/list_view_layout.xml
@@ -63,8 +63,22 @@
             android:layout_weight="0"
             android:padding="0dp"
             android:src="@drawable/filter_icon_button"
+            android:background="@null" />
+
+        <LinearLayout
+            android:layout_width="2px"
+            android:layout_height="fill_parent"
+            android:background="#6D9624" />
+
+        <ImageButton
+            android:id="@+id/settings_icon_button_list"
+            android:layout_width="58dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0"
             android:background="@null"
-            />
+            android:tint="@android:color/white"
+            android:src="@android:drawable/ic_menu_preferences" />
+
     </LinearLayout>
 
     <LinearLayout
diff --git a/extras/android-event-viewer/app/src/main/res/layout/main.xml b/extras/android-event-viewer/app/src/main/res/layout/main.xml
index 15c8f2c9e5..76828ab7f3 100644
--- a/extras/android-event-viewer/app/src/main/res/layout/main.xml
+++ b/extras/android-event-viewer/app/src/main/res/layout/main.xml
@@ -64,6 +64,21 @@
             android:background="@null"
             android:padding="0dp"
             android:src="@drawable/icon_filter_pressed" />
+
+        <LinearLayout
+            android:layout_width="2px"
+            android:layout_height="fill_parent"
+            android:background="#6D9624" />
+
+        <ImageButton
+            android:id="@+id/settings_icon_button_main"
+            android:layout_width="58dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0"
+            android:background="@null"
+            android:tint="@android:color/white"
+            android:src="@android:drawable/ic_menu_preferences" />
+
     </LinearLayout>
 
     <LinearLayout