From 6c08ad3d81aa715f5a54c283e82268ffc070d91e Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Mon, 4 Nov 2013 11:31:42 +0000 Subject: [PATCH] 2013-11-01 Miguel de Dios * src/pandroid_event_viewer/pandorafms/EventList.java, src/pandroid_event_viewer/pandorafms/Main.java, src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java, res/layout/list_view_layout.xml, res/layout/main.xml: changes in the theme of app. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8998 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- extras/pandroid_event_viewer/ChangeLog | 8 ++ .../res/layout/list_view_layout.xml | 127 +++++++++++------- .../pandroid_event_viewer/res/layout/main.xml | 4 +- .../pandorafms/EventList.java | 21 ++- .../pandorafms/Main.java | 11 +- .../PandroidEventviewerActivity.java | 9 +- 6 files changed, 120 insertions(+), 60 deletions(-) diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog index bcb742d971..58cba64387 100644 --- a/extras/pandroid_event_viewer/ChangeLog +++ b/extras/pandroid_event_viewer/ChangeLog @@ -1,3 +1,11 @@ +2013-11-01 Miguel de Dios + + * src/pandroid_event_viewer/pandorafms/EventList.java, + src/pandroid_event_viewer/pandorafms/Main.java, + src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java, + res/layout/list_view_layout.xml, res/layout/main.xml: changes in the + theme of app. + 2013-10-31 Miguel de Dios * src/pandroid_event_viewer/pandorafms/Main.java, 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 5fe028f011..835868c7b0 100644 --- a/extras/pandroid_event_viewer/res/layout/list_view_layout.xml +++ b/extras/pandroid_event_viewer/res/layout/list_view_layout.xml @@ -14,51 +14,84 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. --> - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extras/pandroid_event_viewer/res/layout/main.xml b/extras/pandroid_event_viewer/res/layout/main.xml index c8863b2427..59059ac7a1 100644 --- a/extras/pandroid_event_viewer/res/layout/main.xml +++ b/extras/pandroid_event_viewer/res/layout/main.xml @@ -27,7 +27,7 @@ android:orientation="horizontal" > = object.count_events) { + } + else if (((long) object.eventList.size()) >= object.count_events) { button.setVisibility(Button.GONE); - } else { + } + else { button.setVisibility(Button.VISIBLE); } @@ -109,7 +114,8 @@ public class EventList extends ListActivity { LinearLayout layout = (LinearLayout) findViewById(R.id.loading_layout); layout.setVisibility(LinearLayout.GONE); la.showLoadingEvents = false; - } else { + } + else { LinearLayout layout = (LinearLayout) findViewById(R.id.loading_layout); layout.setVisibility(LinearLayout.GONE); @@ -122,6 +128,15 @@ public class EventList extends ListActivity { la.notifyDataSetChanged(); } }; + + ImageButton filter_button = (ImageButton)findViewById(R.id.filter_icon_button_list); + filter_button.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Activity a = (Activity)v.getContext(); + TabActivity ta = (TabActivity) a.getParent(); + ta.getTabHost().setCurrentTab(0); + } + }); registerReceiver(onBroadcast, new IntentFilter("eventlist.java")); diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java index fd18b79b1c..b57055cb14 100644 --- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java +++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java @@ -103,7 +103,7 @@ public class Main extends Activity { setContentView(R.layout.main); final Button buttonSetAsFilterWatcher = (Button) findViewById(R.id.button_set_as_filter_watcher); - final ImageButton buttonSearch = (ImageButton) findViewById(R.id.filter_icon_button); + final ImageButton buttonSearch = (ImageButton) findViewById(R.id.refresh_icon_button_main); final Button buttonDeleteProfile = (Button) findViewById(R.id.button_delete_profile); final Button buttonSaveProfile = (Button) findViewById(R.id.button_save_profile); // Check if the user preferences it is set. @@ -115,7 +115,7 @@ public class Main extends Activity { toast.show(); buttonSetAsFilterWatcher.setEnabled(false); - buttonSearch.setEnabled(false); + //buttonSearch.setEnabled(false); buttonDeleteProfile.setEnabled(false); } else if (object.user.equals("demo") || object.password.equals("demo")) { @@ -124,7 +124,7 @@ public class Main extends Activity { Toast.LENGTH_LONG); toast.show(); } - buttonSearch.setEnabled(false); + //buttonSearch.setEnabled(false); buttonSetAsFilterWatcher.setEnabled(false); buttonDeleteProfile.setEnabled(false); @@ -335,12 +335,15 @@ public class Main extends Activity { combo.setSelection(index_combo); Button buttonSaveAsFilterWatcher = (Button) findViewById(R.id.button_set_as_filter_watcher); - ImageButton buttonSearch = (ImageButton) findViewById(R.id.filter_icon_button); + ImageButton buttonSearch = (ImageButton) findViewById(R.id.filter_icon_button_main); Button buttonDeleteProfile = (Button) findViewById(R.id.button_delete_profile); Button buttonSaveProfile = (Button) findViewById(R.id.button_save_profile); buttonSaveAsFilterWatcher.setEnabled(true); buttonSearch.setEnabled(true); + + Log.e("CACA", "CACA " + buttonSearch.isEnabled()); + buttonDeleteProfile.setEnabled(true); buttonSaveProfile.setEnabled(true); } diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java index cd98e55100..41a8e72064 100644 --- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java +++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java @@ -37,7 +37,9 @@ import android.content.res.Configuration; import android.os.AsyncTask; import android.os.Bundle; import android.util.Log; +import android.view.View; import android.widget.BaseAdapter; +import android.widget.ImageButton; import android.widget.TabHost; import android.widget.Toast; public class PandroidEventviewerActivity extends TabActivity implements @@ -148,8 +150,8 @@ public class PandroidEventviewerActivity extends TabActivity implements R.string.item_tab_event_list_text)) .setContent(i_event_list)); - tabHost.getTabWidget().getChildAt(0).getLayoutParams().height = 45; - tabHost.getTabWidget().getChildAt(1).getLayoutParams().height = 45; + tabHost.getTabWidget().getChildAt(0).getLayoutParams().height = 0; + tabHost.getTabWidget().getChildAt(1).getLayoutParams().height = 0; } public void onResume() { @@ -178,7 +180,6 @@ public class PandroidEventviewerActivity extends TabActivity implements executeBackgroundGetEvents(false); this.showTabListFirstTime = false; } - } public void onConfigurationChanged(Configuration newConfig) { @@ -243,7 +244,7 @@ public class PandroidEventviewerActivity extends TabActivity implements this.status = preferences.getInt("filterStatus", 3); this.eventSearch = preferences.getString("filterEventSearch", ""); - this.getTabHost().setCurrentTab(1); +// this.getTabHost().setCurrentTab(1); this.loadInProgress = true; this.getNewListEvents = true;