From 9a975880c4b8718e563e9af3379621e646c0f77c Mon Sep 17 00:00:00 2001 From: Juan Miguel Boyero Corral Date: Wed, 4 Apr 2012 01:10:40 +0000 Subject: [PATCH] Added rotating refresh image when updating notifications git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@258 5bc14d19-1e4b-4ba2-aa50-860af135f48c --- SWADroid/gen/es/ugr/swad/swadroid/R.java | 154 +++++++++--------- SWADroid/res/layout/action_bar.xml | 12 ++ .../modules/notifications/Notifications.java | 30 +++- 3 files changed, 118 insertions(+), 78 deletions(-) diff --git a/SWADroid/gen/es/ugr/swad/swadroid/R.java b/SWADroid/gen/es/ugr/swad/swadroid/R.java index e24d15e7..65e5232b 100644 --- a/SWADroid/gen/es/ugr/swad/swadroid/R.java +++ b/SWADroid/gen/es/ugr/swad/swadroid/R.java @@ -44,90 +44,92 @@ public final class R { public static final int note=0x7f02000e; public static final int notif=0x7f02000f; public static final int recmsg=0x7f020010; - public static final int survey=0x7f020011; - public static final int test=0x7f020012; - public static final int timepicker_down_btn=0x7f020013; - public static final int timepicker_down_disabled=0x7f020014; - public static final int timepicker_down_disabled_focused=0x7f020015; - public static final int timepicker_down_normal=0x7f020016; - public static final int timepicker_down_pressed=0x7f020017; - public static final int timepicker_down_selected=0x7f020018; - public static final int timepicker_input=0x7f020019; - public static final int timepicker_input_disabled=0x7f02001a; - public static final int timepicker_input_normal=0x7f02001b; - public static final int timepicker_input_pressed=0x7f02001c; - public static final int timepicker_input_selected=0x7f02001d; - public static final int timepicker_up_btn=0x7f02001e; - public static final int timepicker_up_disabled=0x7f02001f; - public static final int timepicker_up_disabled_focused=0x7f020020; - public static final int timepicker_up_normal=0x7f020021; - public static final int timepicker_up_pressed=0x7f020022; - public static final int timepicker_up_selected=0x7f020023; - public static final int title_button=0x7f020024; - public static final int title_refresh=0x7f020025; + public static final int rotate_refresh=0x7f020011; + public static final int survey=0x7f020012; + public static final int test=0x7f020013; + public static final int timepicker_down_btn=0x7f020014; + public static final int timepicker_down_disabled=0x7f020015; + public static final int timepicker_down_disabled_focused=0x7f020016; + public static final int timepicker_down_normal=0x7f020017; + public static final int timepicker_down_pressed=0x7f020018; + public static final int timepicker_down_selected=0x7f020019; + public static final int timepicker_input=0x7f02001a; + public static final int timepicker_input_disabled=0x7f02001b; + public static final int timepicker_input_normal=0x7f02001c; + public static final int timepicker_input_pressed=0x7f02001d; + public static final int timepicker_input_selected=0x7f02001e; + public static final int timepicker_up_btn=0x7f02001f; + public static final int timepicker_up_disabled=0x7f020020; + public static final int timepicker_up_disabled_focused=0x7f020021; + public static final int timepicker_up_normal=0x7f020022; + public static final int timepicker_up_pressed=0x7f020023; + public static final int timepicker_up_selected=0x7f020024; + public static final int title_button=0x7f020025; + public static final int title_refresh=0x7f020026; } public static final class id { public static final int actionBarLayout=0x7f090000; - public static final int clean_database_menu=0x7f09003e; - public static final int contentWebView=0x7f090023; - public static final int courseNameText=0x7f090021; - public static final int decrement=0x7f09001f; - public static final int eventContent=0x7f090017; - public static final int eventDate=0x7f090013; - public static final int eventLocation=0x7f090019; - public static final int eventMetaData=0x7f090011; - public static final int eventMsg=0x7f09001c; - public static final int eventSender=0x7f090015; - public static final int eventSummary=0x7f09001a; - public static final int eventText=0x7f09001b; - public static final int eventTime=0x7f090014; - public static final int eventType=0x7f090018; - public static final int increment=0x7f09001d; - public static final int listIcon=0x7f090009; - public static final int listItems=0x7f09000b; - public static final int listText=0x7f09000a; - public static final int messageReplyButton=0x7f090016; - public static final int message_body_text=0x7f09000e; - public static final int message_button_accept=0x7f09000f; - public static final int message_button_cancel=0x7f090010; - public static final int message_receivers_text=0x7f09000c; - public static final int message_subject_text=0x7f09000d; + public static final int clean_database_menu=0x7f09003f; + public static final int contentWebView=0x7f090024; + public static final int courseNameText=0x7f090022; + public static final int decrement=0x7f090020; + public static final int eventContent=0x7f090018; + public static final int eventDate=0x7f090014; + public static final int eventLocation=0x7f09001a; + public static final int eventMetaData=0x7f090012; + public static final int eventMsg=0x7f09001d; + public static final int eventSender=0x7f090016; + public static final int eventSummary=0x7f09001b; + public static final int eventText=0x7f09001c; + public static final int eventTime=0x7f090015; + public static final int eventType=0x7f090019; + public static final int increment=0x7f09001e; + public static final int listIcon=0x7f09000a; + public static final int listItems=0x7f09000c; + public static final int listText=0x7f09000b; + public static final int messageReplyButton=0x7f090017; + public static final int message_body_text=0x7f09000f; + public static final int message_button_accept=0x7f090010; + public static final int message_button_cancel=0x7f090011; + public static final int message_receivers_text=0x7f09000d; + public static final int message_subject_text=0x7f09000e; public static final int moduleIcon=0x7f090001; public static final int moduleName=0x7f090002; - public static final int notificationIcon=0x7f090012; - public static final int preferences_menu=0x7f09003f; - public static final int rate_menu=0x7f09003d; + public static final int notificationIcon=0x7f090013; + public static final int preferences_menu=0x7f090040; + public static final int progress_refresh=0x7f090009; + public static final int rate_menu=0x7f09003e; public static final int refresh=0x7f090008; - public static final int senderNameText=0x7f090020; - public static final int share_menu=0x7f09003c; - public static final int summaryText=0x7f090022; - public static final int testAnswerTypesAcceptButton=0x7f090026; - public static final int testAnswerTypesList=0x7f090025; - public static final int testAnswerTypesText=0x7f090024; + public static final int senderNameText=0x7f090021; + public static final int share_menu=0x7f09003d; + public static final int summaryText=0x7f090023; + public static final int testAnswerTypesAcceptButton=0x7f090027; + public static final int testAnswerTypesList=0x7f090026; + public static final int testAnswerTypesText=0x7f090025; public static final int testEvaluateButton=0x7f090006; - public static final int testMakeAnswer=0x7f09002a; - public static final int testMakeBottomBar=0x7f09002f; - public static final int testMakeCorrectAnswer=0x7f09002d; - public static final int testMakeCorrectAnswerImage=0x7f09002b; - public static final int testMakeEditText=0x7f09002c; - public static final int testMakeList=0x7f09002e; - public static final int testMakeNextButton=0x7f090032; - public static final int testMakePrevButton=0x7f090030; - public static final int testMakeQuestionScore=0x7f090028; - public static final int testMakeStem=0x7f090027; - public static final int testMakeText=0x7f090029; - public static final int testNumQuestionsAcceptButton=0x7f090038; - public static final int testNumQuestionsNumberPicker=0x7f090035; - public static final int testNumQuestionsText=0x7f090037; - public static final int testResultsButton=0x7f090036; - public static final int testResultsScore=0x7f090034; - public static final int testResultsText=0x7f090033; + public static final int testMakeAnswer=0x7f09002b; + public static final int testMakeBottomBar=0x7f090030; + public static final int testMakeCorrectAnswer=0x7f09002e; + public static final int testMakeCorrectAnswerImage=0x7f09002c; + public static final int testMakeEditText=0x7f09002d; + public static final int testMakeList=0x7f09002f; + public static final int testMakeNextButton=0x7f090033; + public static final int testMakePrevButton=0x7f090031; + public static final int testMakeQuestionScore=0x7f090029; + public static final int testMakeStem=0x7f090028; + public static final int testMakeText=0x7f09002a; + public static final int testNumQuestionsAcceptButton=0x7f090039; + public static final int testNumQuestionsNumberPicker=0x7f090036; + public static final int testNumQuestionsText=0x7f090038; + public static final int testResultsButton=0x7f090037; + public static final int testResultsScore=0x7f090035; + public static final int testResultsText=0x7f090034; public static final int testShowResultsButton=0x7f090004; - public static final int testTagsAcceptButton=0x7f09003b; - public static final int testTagsList=0x7f09003a; - public static final int testTagsText=0x7f090039; - public static final int test_questions_bar=0x7f090031; - public static final int timepicker_input=0x7f09001e; + public static final int testTagsAcceptButton=0x7f09003c; + public static final int testTagsList=0x7f09003b; + public static final int testTagsText=0x7f09003a; + public static final int test_questions_bar=0x7f090032; + public static final int timepicker_input=0x7f09001f; public static final int title_sep_1=0x7f090007; public static final int title_sep_2=0x7f090005; public static final int title_sep_3=0x7f090003; diff --git a/SWADroid/res/layout/action_bar.xml b/SWADroid/res/layout/action_bar.xml index 129da73f..32d9f66a 100644 --- a/SWADroid/res/layout/action_bar.xml +++ b/SWADroid/res/layout/action_bar.xml @@ -101,6 +101,7 @@ + + diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/Notifications.java b/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/Notifications.java index 9f1aed4e..d705ac89 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/Notifications.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/Notifications.java @@ -48,6 +48,7 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.ListView; +import android.widget.ProgressBar; import android.widget.TextView; /** @@ -136,6 +137,7 @@ public class Notifications extends Module { }; super.onCreate(savedInstanceState); + setContentView(R.layout.list_items); image = (ImageView)this.findViewById(R.id.moduleIcon); @@ -178,6 +180,12 @@ public class Notifications extends Module { */ public void onRefreshClick(View v) { + ImageButton updateButton = (ImageButton)this.findViewById(R.id.refresh); + ProgressBar pb = (ProgressBar)this.findViewById(R.id.progress_refresh); + + updateButton.setVisibility(View.GONE); + pb.setVisibility(View.VISIBLE); + runConnection(); } @@ -291,8 +299,8 @@ public class Notifications extends Module { protected void connect() { String progressDescription = getString(R.string.notificationsProgressDescription); int progressTitle = R.string.notificationsProgressTitle; - - new Connect(true, progressDescription, progressTitle).execute(); + + new Connect(false, progressDescription, progressTitle).execute(); } /* (non-Javadoc) @@ -304,6 +312,24 @@ public class Notifications extends Module { //Toast.makeText(this, R.string.notificationsDownloadedMsg, Toast.LENGTH_SHORT).show(); alertNotif(); + + ProgressBar pb = (ProgressBar)this.findViewById(R.id.progress_refresh); + ImageButton updateButton = (ImageButton)this.findViewById(R.id.refresh); + + pb.setVisibility(View.GONE); + updateButton.setVisibility(View.VISIBLE); + } + + /* (non-Javadoc) + * @see es.ugr.swad.swadroid.modules.Module#onError() + */ + @Override + protected void onError() { + ProgressBar pb = (ProgressBar)this.findViewById(R.id.progress_refresh); + ImageButton updateButton = (ImageButton)this.findViewById(R.id.refresh); + + pb.setVisibility(View.GONE); + updateButton.setVisibility(View.VISIBLE); } /**