Changeset 101

Timestamp:

02/03/09 18:37:06 (12 months ago)

Author:

dmyung

Message:

fixed edit text multiline bug
fixed message view to have it look a bit more like the summary view
made dashboard more tolerant of screen orientation changes

Location:

trunk/rapidandroid/org.rapidandroid

Files:

• res/layout/add_field.xml (modified) (2 diffs)
• res/layout/form_create.xml (modified) (3 diffs)
• src/org/rapidandroid/activity/Dashboard.java (modified) (15 diffs)
• src/org/rapidandroid/view/adapter/MessageCursorAdapter.java (modified) (4 diffs)

trunk/rapidandroid/org.rapidandroid/res/layout/add_field.xml

@@ -17 +17 @@
     <EditText android:id="@+id/etx_fieldname"
         android:layout_width="fill_parent" android:layout_height="wrap_content"
-        android:textSize="14sp"></EditText>
+        android:textSize="14sp" android:singleLine="true"></EditText>
 
         <TableRow android:id="@+id/TableRow03" android:layout_width="wrap_content"
@@ -29 +29 @@
         <EditText android:id="@+id/etx_fieldprompt"
         android:layout_width="fill_parent" android:layout_height="wrap_content"
-        android:textSize="14sp"></EditText>
+        android:textSize="14sp" android:singleLine="true"></EditText>
         <TextView android:id="@+id/lbl_fieldtypechoose"
         android:layout_width="fill_parent" android:layout_height="wrap_content"

trunk/rapidandroid/org.rapidandroid/res/layout/form_create.xml

@@ -14 +14 @@
                                 <EditText android:id="@+id/etx_formname"
                                 android:layout_width="fill_parent" android:layout_height="wrap_content"
-                                android:textSize="14sp" android:layout_weight="2"></EditText>
+                                android:textSize="14sp" android:layout_weight="2" android:singleLine="true"></EditText>
                                         <TextView android:layout_width="wrap_content"
                                 android:layout_height="wrap_content" android:text="@string/lbl_formprefix" android:id="@+id/lbl_formprefix" android:layout_weight="0">
@@ -22 +22 @@
 android:layout_width="fill_parent"
 android:layout_height="wrap_content"
-android:textSize="14sp" android:layout_weight="2"></EditText>
+android:textSize="14sp" android:layout_weight="2" android:singleLine="true"></EditText>
         
         </TableRow>
@@ -36 +36 @@
 android:layout_width="fill_parent"
 android:textSize="14sp"
-android:singleLine="false"
-android:gravity="top" android:layout_height="wrap_content" android:layout_weight="2"></EditText>                
+android:gravity="top" android:layout_height="wrap_content" android:layout_weight="2" android:singleLine="true"></EditText>              
                                 
                                 </TableRow>

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/activity/Dashboard.java

@@ -54 +54 @@
  * 
  */
-public class Dashboard extends Activity {       
-        
-        private SingleRowHeaderView headerView;
+public class Dashboard extends Activity {               
+
         private SummaryCursorAdapter summaryView; 
         private FormDataGridCursorAdapter rowView;
         private MessageCursorAdapter messageCursorAdapter;
         
-        //private ProgressDialog mLoadingDialog;
-        
+        //private ProgressDialog mLoadingDialog;        
         
         private Form mChosenForm = null;
-        
-                
-        private boolean mShowMonitors = false;
         private boolean mShowAllMessages = false;
 
@@ -82 +77 @@
         // private static final int MENU_EXIT = Menu.FIRST + 3; //waitaminute, we
         // don't want to exit this thing, do we?
-
-        
+        
+        private static final String STATE_DATE_START = "startdate";
+        private static final String STATE_DATE_END = "enddate";
+        private static final String STATE_SPINNER_POSITION = "spinneritem";
+        private static final String STATE_SELECTED_FORM = "selectedform";
+        private static final String STATE_LSV_POSITION = "listposition";
+        private static final String STATE_LSV_VIEWMODE = "viewmode";
         
         private static final int CONTEXT_ITEM_SUMMARY_VIEW = Menu.FIRST;
@@ -104 +104 @@
         boolean resetCursor = true; 
         Cursor mListviewCursor = null; 
+        private int selectedListViewPosition = -1;
         
         private Date mStartDate;
@@ -115 +116 @@
                 requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
                 setTitle("RapidAndroid :: Dashboard");          
-                setContentView(R.layout.dashboard);
-
-//              if (savedInstanceState != null) {
-//                      String from = savedInstanceState.getString("from");
-//                      String body = savedInstanceState.getString("body");
-//                      //dialogMessage = "SMS :: " + from + " : " + body;
-//                      //showDialog(160);
-//              }
-                
-//              mLoadingDialog = new ProgressDialog(this,ProgressDialog.STYLE_HORIZONTAL);
-//              mLoadingDialog.setMessage("Loading data...");
-//              mLoadingDialog.setTitle("Please wait");
-//              mLoadingDialog.setIndeterminate(true);
-//              mLoadingDialog.setCancelable(false);                    
-
-                this.loadFormSpinner();
-
+                setContentView(R.layout.dashboard);             
+                this.initFormSpinner();
                 // Set the event listeners for the spinner and the listview
                 Spinner spin_forms = (Spinner) findViewById(R.id.cbx_forms);
@@ -176 +162 @@
                                         ((SummaryCursorAdapter) adapter.getAdapter()).toggle(position);
                                 }
-
-                        }
-
+                        }
                 });     
                 
@@ -184 +168 @@
                 mEndDate = new Date();
                 mStartDate = new Date();
-                mStartDate.setDate(mEndDate.getDate() - 1);
+                mStartDate.setDate(mEndDate.getDate() - 1);             
+        }
+        
+        /* (non-Javadoc)
+         * @see android.app.Activity#onRestoreInstanceState(android.os.Bundle)
+         */
+        @Override
+        protected void onRestoreInstanceState(Bundle savedInstanceState) {
+                super.onRestoreInstanceState(savedInstanceState);
+                if (savedInstanceState != null) {
+                        if (savedInstanceState.containsKey(STATE_DATE_START)
+                                        && savedInstanceState.containsKey(STATE_DATE_END)
+                                        && savedInstanceState.containsKey(STATE_SPINNER_POSITION)
+                                //      && savedInstanceState.containsKey(STATE_LSV_POSITION)
+                                        && savedInstanceState.containsKey(STATE_LSV_VIEWMODE)
+                                        //&& savedInstanceState.containsKey(STATE_SELECTED_FORM)
+                                        ) {
+                                
+                                try {
+                                        mStartDate = Message.SQLDateFormatter.parse(savedInstanceState.getString(STATE_DATE_START));
+                                        mEndDate = Message.SQLDateFormatter.parse(savedInstanceState.getString(STATE_DATE_END));
+                                } catch (ParseException e) {
+                                        // TODO Auto-generated catch block
+                                        e.printStackTrace();
+                                }
+                                formViewMode = savedInstanceState.getInt(STATE_LSV_VIEWMODE);
+                                
+                                Spinner spin_forms = (Spinner) findViewById(R.id.cbx_forms);
+                                spin_forms.setSelection(savedInstanceState.getInt(STATE_SPINNER_POSITION));                             
+                        }
+                                        
+                        
+//                      String from = savedInstanceState.getString("from");
+//                      String body = savedInstanceState.getString("body");
+//                      //dialogMessage = "SMS :: " + from + " : " + body;
+//                      //showDialog(160);
+                }
+        }
+
+        /* (non-Javadoc)
+         * @see android.app.Activity#onSaveInstanceState(android.os.Bundle)
+         */
+        @Override
+        protected void onSaveInstanceState(Bundle outState) {
+                // TODO Auto-generated method stub
+                super.onSaveInstanceState(outState);
+                outState.putString(STATE_DATE_START, Message.SQLDateFormatter.format(mStartDate));
+                outState.putString(STATE_DATE_END, Message.SQLDateFormatter.format(mEndDate));
+                outState.putInt(STATE_LSV_VIEWMODE, formViewMode);
+                Spinner spin_forms = (Spinner) findViewById(R.id.cbx_forms);
+                outState.putInt(STATE_SPINNER_POSITION,spin_forms.getSelectedItemPosition());
         }
 
@@ -201 +235 @@
                 case ACTIVITY_CREATE:
                         // we should do an update of the view
-                        loadFormSpinner();              
+                        initFormSpinner();              
                         resetCursor = true;
                         beginListViewReload();
@@ -350 +384 @@
 
                 // we want to chart for a form
-                if (mChosenForm != null && !mShowAllMessages && !mShowMonitors) {
+                if (mChosenForm != null && !mShowAllMessages) {
                         Date endDate = new Date();
                         endDate = ParsedDataReporter.getOldestMessageDate(this,mChosenForm);    
@@ -364 +398 @@
                         i.putExtra(ChartData.CallParams.CHART_FORM, mChosenForm
                                                         .getFormId());
-                } else if (mShowAllMessages && !mShowMonitors) {
+                } else if (mShowAllMessages) {
                         // Chart for messages
                         i.putExtra(ChartData.CallParams.CHART_MESSAGES, true);
-                } else if (mShowMonitors && !mShowAllMessages) {
-                        //Chart for monitors
-                }               
+                }       
                 i.putExtra(ChartData.CallParams.START_DATE, Message.SQLDateFormatter.format(mStartDate));
                 i.putExtra(ChartData.CallParams.END_DATE, Message.SQLDateFormatter.format(mEndDate));
@@ -377 +409 @@
 
         // This is a call to the DB to get all the forms that this form can support.
-        private void loadFormSpinner() {
+        private void initFormSpinner() {
                 // The steps:
                 // get the spinner control from the layouts
@@ -385 +417 @@
                 this.mAllForms = ModelTranslator.getAllForms();
 
-                String[] monitors = new String[mAllForms.length + 2];
+                String[] monitors = new String[mAllForms.length + 1];
                 
 
@@ -393 +425 @@
                 
                 //add some special selections:
-                monitors[monitors.length - 2] = "Show all Messages";
-                monitors[monitors.length - 1] = "Show Monitors";
+                monitors[monitors.length - 1] = "Show all Messages";
+                //monitors[monitors.length - 1] = "Show Monitors";
                 
                 ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_spinner_item, monitors);
@@ -407 +439 @@
                         mChosenForm = null;
                         this.mShowAllMessages = true;
-                        this.mShowMonitors = false;
                         resetCursor = true;
                         beginListViewReload();
-                        //loadListViewWithRawMessages();
-                        
-
-                } else if (position == mAllForms.length + 1) {
-                        // then it's show all monitors                  
-                        mChosenForm = null;
-                        this.mShowAllMessages = false;
-                        this.mShowMonitors = true;
-                        resetCursor = true;
-                        beginListViewReload();
-                        //loadListViewsWithMonitors();
-                        
+                        //loadListViewWithRawMessages();                        
+
                 } else {
                         this.mShowAllMessages = false;
-                        this.mShowMonitors = false;
                         mChosenForm = mAllForms[position];
                         resetCursor = true;
-                        beginListViewReload();
-                        //loadListViewWithFormData(true);
-                }               
+                        beginListViewReload();                  
+                }
         }
                 
@@ -441 +460 @@
         ListView lsv = (ListView) findViewById(R.id.lsv_dashboardmessages);             
                 
-        if(mChosenForm != null && !mShowAllMessages && !mShowMonitors) {
+        if(mChosenForm != null && !mShowAllMessages) {
                 loadListViewWithFormData();
         }
-        else if(mShowAllMessages && mChosenForm == null && !mShowMonitors) {
+        else if(mShowAllMessages && mChosenForm == null) {
                         this.messageCursorAdapter = new MessageCursorAdapter(this, mListviewCursor);
                         lsv.setAdapter(messageCursorAdapter);
         }
-        else if(mShowMonitors && !mShowAllMessages && mChosenForm==null) {              
-                lsv.setAdapter(new ArrayAdapter<String>(this,android.R.layout.simple_list_item_1, new String[] {"todo"}));              
-                
-        }       
+        
     }
     
@@ -479 +495 @@
     private void fillCursorInBackground() {
         if(mListviewCursor == null) {
-                if(mChosenForm != null && !mShowAllMessages && !mShowMonitors) {
-                        String whereclause = " rapidandroid_message.time > '" + Message.SQLDateFormatter.format(mStartDate) + "' AND time < '" + Message.SQLDateFormatter.format(mEndDate) + "'";
+                if(mChosenForm != null && !mShowAllMessages) {
+                        String whereclause = " rapidandroid_message.time >= '" + Message.SQLDateFormatter.format(mStartDate) + "' AND time <= '" + Message.SQLDateFormatter.format(mEndDate) + "'";
                         mListviewCursor = getContentResolver().query(Uri.parse(RapidSmsDBConstants.FormData.CONTENT_URI_PREFIX + mChosenForm.getFormId()), null,whereclause,null,null);
                         
-                } else if(mShowAllMessages && mChosenForm == null && !mShowMonitors) {
-                        String whereclause = "time > '" + Message.SQLDateFormatter.format(mStartDate) + "' AND time < '" + Message.SQLDateFormatter.format(mEndDate) + "'";
+                } else if(mShowAllMessages && mChosenForm == null) {
+                        String whereclause = "time >= '" + Message.SQLDateFormatter.format(mStartDate) + "' AND time <= '" + Message.SQLDateFormatter.format(mEndDate) + "'";
                         mListviewCursor = getContentResolver().query(RapidSmsDBConstants.Message.CONTENT_URI, null, whereclause, null, "time DESC");
                         
-                } else if(mShowMonitors && !mShowAllMessages && mChosenForm==null) {
-                        //do something
-//                      query.append("WHERE rapidandroid_message.time > '" + startDate.get(Calendar.YEAR) + "-" + (startDate.get(Calendar.MONTH)+1) + "-" + startDate.get(Calendar.DATE) + "' AND ");
-//                      query.append(" rapidandroid_message.time < '" + endDate.get(Calendar.YEAR) + "-" + (1+endDate.get(Calendar.MONTH)) + "-" + endDate.get(Calendar.DATE) + "';");
-//              
-                }       
+                }       
         }       
     }

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/view/adapter/MessageCursorAdapter.java

@@ -9 +9 @@
 import android.content.Context;
 import android.database.Cursor;
+import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14 +15 @@
 import android.widget.LinearLayout;
 import android.widget.TableLayout;
+import android.widget.TableRow;
 import android.widget.TextView;
 
@@ -65 +67 @@
         private class SimpleMessageView extends TableLayout {
 
+                
+                private TableRow mHeaderRow;
+                private TextView txvDate;
+                private TextView txvFrom;
                 private TextView txvMessage;
-                private TextView txvHeader;
+
                 
                 
                 public SimpleMessageView(Context context, String message, Date timestamp, int monitorID, boolean isOutgoing) {
                         super(context);
-                        txvHeader = new TextView(context);
-                        txvHeader.setLayoutParams(new LinearLayout.LayoutParams(android.view.ViewGroup.LayoutParams.FILL_PARENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT));
+                        mHeaderRow = new TableRow(context);
+                        
+                        txvDate = new TextView(context);
+                        txvDate.setTextSize(16);
+                        txvDate.setPadding(3,3,3,3);
+                        txvDate.setGravity(Gravity.LEFT);
+                        txvFrom = new TextView(context);
+                        txvFrom.setTextSize(16);
+                        txvFrom.setPadding(3,3,8,3);
+                        txvFrom.setGravity(Gravity.RIGHT);
+                        
                         //this.addView(txvHeader, new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
-                        this.addView(txvHeader);
+                        mHeaderRow.addView(txvDate);
+                        mHeaderRow.addView(txvFrom);
+                        addView(mHeaderRow);
                         
                         txvMessage = new TextView(context);
+                        txvMessage.setTextSize(12);
+                        txvMessage.setPadding(8,2,8,2);
                         //this.addView(txvMessage, new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
                         this.addView(txvMessage);
+                        
+                        this.setColumnStretchable(0, true);
+                        this.setColumnStretchable(1, true);
                         
                         setData(message,timestamp,monitorID,isOutgoing);
@@ -85 +107 @@
                 
                 public void setData(String message, Date timestamp, int monitorID, boolean isOutgoing) {
-                        StringBuilder sb = new StringBuilder();
-                        if(isOutgoing) {
-                                sb.append("[Out] <<< ");
-                        } else {
-                                sb.append("[In] >>> " );
-                        }
+                        txvDate.setText(Message.DisplayDateTimeFormat.format(timestamp));
                         
-                        sb.append(Message.DisplayDateTimeFormat.format(timestamp) + " [");
                         Monitor m = MessageTranslator.GetMonitor(getContext(), monitorID);
-                        sb.append(m.getPhone() + "]");                  
-                        //txvHeader.setText(Message.DisplayDateTimeFormat.format(timestamp));
-                        txvHeader.setText(sb.toString());
+                        txvFrom.setText(m.getPhone());
                         
                         txvMessage.setText(message);