Merge lp:~openerp-dev/openerp-mobile-client/trunk-note_grid_update-sla into lp:openerp-mobile-client

[Shailesh Lakum(OpenERP)]

Hello,

Following updates are done in Note module:

1) Attachment with Expandable Grid Support
2) Audio, File, Image attachment support
3) Speech to text in note compose

Thanks,
Shailesh Lakum (sla)

=== added file 'res/drawable-hdpi/ic_action_cancel.png'
 Binary files res/drawable-hdpi/ic_action_cancel.png	1970-01-01 00:00:00 +0000 and res/drawable-hdpi/ic_action_cancel.png	2014-04-28 07:01:36 +0000 differ
=== added file 'res/drawable-hdpi/ic_menu_action_content_new_attachment.png'
 Binary files res/drawable-hdpi/ic_menu_action_content_new_attachment.png	1970-01-01 00:00:00 +0000 and res/drawable-hdpi/ic_menu_action_content_new_attachment.png	2014-04-28 07:01:36 +0000 differ
=== added file 'res/drawable-mdpi/ic_action_cancel.png'
 Binary files res/drawable-mdpi/ic_action_cancel.png	1970-01-01 00:00:00 +0000 and res/drawable-mdpi/ic_action_cancel.png	2014-04-28 07:01:36 +0000 differ
=== added file 'res/drawable-mdpi/ic_menu_action_content_new_attachment.png'
 Binary files res/drawable-mdpi/ic_menu_action_content_new_attachment.png	1970-01-01 00:00:00 +0000 and res/drawable-mdpi/ic_menu_action_content_new_attachment.png	2014-04-28 07:01:36 +0000 differ
=== added file 'res/drawable-xhdpi/ic_action_cancel.png'
 Binary files res/drawable-xhdpi/ic_action_cancel.png	1970-01-01 00:00:00 +0000 and res/drawable-xhdpi/ic_action_cancel.png	2014-04-28 07:01:36 +0000 differ
=== added file 'res/drawable-xhdpi/ic_menu_action_content_new_attachment.png'
 Binary files res/drawable-xhdpi/ic_menu_action_content_new_attachment.png	1970-01-01 00:00:00 +0000 and res/drawable-xhdpi/ic_menu_action_content_new_attachment.png	2014-04-28 07:01:36 +0000 differ
=== added file 'res/drawable-xxhdpi/ic_action_cancel.png'
 Binary files res/drawable-xxhdpi/ic_action_cancel.png	1970-01-01 00:00:00 +0000 and res/drawable-xxhdpi/ic_action_cancel.png	2014-04-28 07:01:36 +0000 differ
=== added file 'res/drawable-xxhdpi/ic_menu_action_content_new_attachment.png'
 Binary files res/drawable-xxhdpi/ic_menu_action_content_new_attachment.png	1970-01-01 00:00:00 +0000 and res/drawable-xxhdpi/ic_menu_action_content_new_attachment.png	2014-04-28 07:01:36 +0000 differ
=== modified file 'res/layout/fragment_note_compose.xml'
--- res/layout/fragment_note_compose.xml	2014-04-14 13:27:33 +0000
+++ res/layout/fragment_note_compose.xml	2014-04-28 07:01:36 +0000
@@ -4,17 +4,13 @@
     android:layout_height="match_parent"
     android:background="#f5f5f5"
     android:clipToPadding="false"
-    android:fillViewport="true"
-    android:paddingBottom="10dp"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp"
     android:paddingTop="?android:attr/actionBarSize" >
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="15dp" >
+        android:padding="10dp" >
 
         <EditText
             android:id="@+id/edtNoteTitleInput"
@@ -48,19 +44,19 @@
             android:fontFamily="sans-serif-light"
             android:hint="@string/compose_note_description" />
 
-        <GridView
+        <WebView
+            android:id="@+id/webNoteComposeWebViewPad"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="invisible" />
+
+        <com.openerp.util.controls.ExpandableHeightGridView
             android:id="@+id/noteAttachmentGrid"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:horizontalSpacing="5dp"
             android:numColumns="2"
             android:verticalSpacing="5dp" />
-
-        <WebView
-            android:id="@+id/webNoteComposeWebViewPad"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="invisible" />
     </LinearLayout>
 
 </ScrollView>
 \ No newline at end of file
 
=== modified file 'res/layout/fragment_note_detail.xml'
--- res/layout/fragment_note_detail.xml	2014-04-14 13:27:33 +0000
+++ res/layout/fragment_note_detail.xml	2014-04-28 07:01:36 +0000
@@ -40,23 +40,23 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
+                android:fontFamily="sans-serif-condensed"
                 android:padding="10dp"
-                android:fontFamily="sans-serif-condensed"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/txvNoteDetailMemo"
-                android:fontFamily="sans-serif-light"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
                 android:autoLink="web"
                 android:background="@android:color/transparent"
+                android:fontFamily="sans-serif-light"
                 android:padding="10dp"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
-            
-            <GridView
+
+            <com.openerp.util.controls.ExpandableHeightGridView
                 android:id="@+id/noteGridViewAttach"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
 
=== modified file 'res/menu/menu_fragment_note_new_edit.xml'
--- res/menu/menu_fragment_note_new_edit.xml	2014-04-14 13:27:33 +0000
+++ res/menu/menu_fragment_note_new_edit.xml	2014-04-28 07:01:36 +0000
@@ -4,10 +4,10 @@
         android:id="@+id/menu_note_speech_to_text"
         android:icon="@drawable/ic_action_speech_to_text"
         android:showAsAction="always"
-        android:title="Speech to text"/>
+        android:title="@string/note_menu_title_speech_to_text"/>
     <item
         android:id="@+id/menu_note_attach"
-        android:icon="@drawable/ic_action_content_new_attachment"
+        android:icon="@drawable/ic_menu_action_content_new_attachment"
         android:showAsAction="always"
         android:title="Attachement">
         <menu>
@@ -27,7 +27,8 @@
     </item>
     <item
         android:id="@+id/menu_note_cancel"
-        android:showAsAction="never"
+        android:icon="@drawable/ic_action_cancel"
+        android:showAsAction="always"
         android:title="Cancel">
     </item>
 
 
=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2014-04-14 13:27:33 +0000
+++ res/values/strings.xml	2014-04-28 07:01:36 +0000
@@ -27,5 +27,7 @@
     <!-- Detail Note Fragment Strings -->
     <string name="detail_note_name">Note Name</string>
     <string name="detail_note_memo">Note Memo</string>
+    
+    <string name="note_menu_title_speech_to_text">Speech to text</string> 
 
 </resources>
 \ No newline at end of file
 
=== modified file 'src/com/openerp/addons/note/Note.java'
--- src/com/openerp/addons/note/Note.java	2014-04-14 13:27:33 +0000
+++ src/com/openerp/addons/note/Note.java	2014-04-28 07:01:36 +0000
@@ -250,8 +250,9 @@
 				whereArgs = new String[] { "true", mStageId + "" };
 				break;
 			}
-			mNotesList.addAll(db().select(where, whereArgs, null, null,
-					"id DESC"));
+			List<OEDataRow> result = db().select(where, whereArgs, null, null,
+					"id DESC");
+			mNotesList.addAll(result);
 			return null;
 		}
 
 
=== modified file 'src/com/openerp/addons/note/NoteComposeActivity.java'
--- src/com/openerp/addons/note/NoteComposeActivity.java	2014-04-14 13:27:33 +0000
+++ src/com/openerp/addons/note/NoteComposeActivity.java	2014-04-28 07:01:36 +0000
@@ -52,7 +52,6 @@
 import android.view.ViewGroup;
 import android.webkit.WebView;
 import android.widget.EditText;
-import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -70,6 +69,7 @@
 import com.openerp.support.OEUser;
 import com.openerp.support.listview.OEListAdapter;
 import com.openerp.util.HTMLHelper;
+import com.openerp.util.controls.ExpandableHeightGridView;
 import com.openerp.util.tags.MultiTagsTextView.TokenListener;
 import com.openerp.util.tags.TagsView;
 import com.openerp.util.tags.TagsView.CustomTagViewListener;
@@ -121,12 +121,12 @@
 	EditText edtNoteTitle = null;
 	EditText edtNoteDescription = null;
 	TagsView mNoteTagsView = null;
-	GridView mNoteAttachmentGrid = null;
+	ExpandableHeightGridView mNoteAttachmentGrid = null;
 	List<Object> mNoteAttachmentList = new ArrayList<Object>();
 	OEListAdapter mNoteListAdapterAttach = null;
 	Attachment mAttachment = null;
-
 	PackageManager mPackageManager = null;
+	String oldName = null;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -153,7 +153,6 @@
 	private void handleIntent() {
 		Log.d(TAG, "NoteComposeActivity->handleIntent()");
 		Intent intent = getIntent();
-
 		if (intent.hasExtra("request_code")) {
 			Attachment.Types type = (Types) intent.getExtras().get(
 					"request_code");
@@ -175,7 +174,8 @@
 	@SuppressLint("SetJavaScriptEnabled")
 	private void initNote() {
 		Intent intent = getIntent();
-		mNoteAttachmentGrid = (GridView) findViewById(R.id.noteAttachmentGrid);
+		mNoteAttachmentGrid = (ExpandableHeightGridView) findViewById(R.id.noteAttachmentGrid);
+		mNoteAttachmentGrid.setExpanded(true);
 		edtNoteTitle = (EditText) findViewById(R.id.edtNoteTitleInput);
 		edtNoteDescription = (EditText) findViewById(R.id.edtNoteComposeDescription);
 		mWebViewPad = (WebView) findViewById(R.id.webNoteComposeWebViewPad);
@@ -200,6 +200,7 @@
 							.get("key_" + mStageId));
 		if (intent.hasExtra("note_title")) {
 			edtNoteTitle.setText(intent.getStringExtra("note_title"));
+			oldName = intent.getStringExtra("note_title");
 		}
 
 		if (mPadInstalled) {
@@ -230,6 +231,7 @@
 		}
 		if (mEditMode) {
 			edtNoteTitle.setText(mNoteRow.getString("name"));
+			oldName = mNoteRow.getString("name");
 			List<OEDataRow> tags = mNoteRow.getM2MRecord("tag_ids")
 					.browseEach();
 			if (tags != null) {
@@ -515,7 +517,9 @@
 	}
 
 	public void saveNote(Integer mNoteId) {
-		if (mOpenERP != null) {
+		if (mOpenERP == null) {
+			Toast.makeText(mContext, "No Connection", Toast.LENGTH_LONG).show();
+		} else {
 			OEValues values = new OEValues();
 			String name = edtNoteTitle.getText().toString();
 			String memo = "";
@@ -536,7 +540,9 @@
 				} catch (Exception e) {
 				}
 			} else {
-				memo = name + "<br/>" + edtNoteDescription.getText().toString();
+				memo = edtNoteDescription.getText().toString();
+				if (oldName != name)
+					memo = name + "<br/>" + memo.replace(oldName, "");
 			}
 			name = noteName(name + "\n" + memo);
 			List<Integer> tag_ids = new ArrayList<Integer>();
@@ -569,10 +575,8 @@
 			data.putExtra("result", id);
 			data.putExtra("is_new", is_new);
 			setResult(RESULT_OK, data);
-			finish();
-		} else {
-			Toast.makeText(mContext, "No Connection", Toast.LENGTH_LONG).show();
 		}
+		finish();
 	}
 
 	private String noteName(String memo) {
@@ -637,7 +641,6 @@
 
 		builder.setPositiveButton("Create", new OnClickListener() {
 			public void onClick(DialogInterface di, int i) {
-				// do something with onClick
 				String mToast = "No Connection ";
 				if ((stage.getText().toString()).equalsIgnoreCase("Add New")
 						|| (stage.getText().toString())
 
=== modified file 'src/com/openerp/addons/note/NoteDB.java'
--- src/com/openerp/addons/note/NoteDB.java	2014-04-09 12:50:36 +0000
+++ src/com/openerp/addons/note/NoteDB.java	2014-04-28 07:01:36 +0000
@@ -82,8 +82,10 @@
 		public List<OEColumn> getModelColumns() {
 			List<OEColumn> cols = new ArrayList<OEColumn>();
 			cols.add(new OEColumn("name", "Name", OEFields.text()));
+			cols.add(new OEColumn("sequence", "Sequence", OEFields.integer()));
 			cols.add(new OEColumn("stage_color", "Stage Color", OEFields
 					.varchar(10), false));
+			
 			return cols;
 		}
 
 
=== modified file 'src/com/openerp/addons/note/NoteDetail.java'
--- src/com/openerp/addons/note/NoteDetail.java	2014-04-15 11:59:20 +0000
+++ src/com/openerp/addons/note/NoteDetail.java	2014-04-28 07:01:36 +0000
@@ -38,7 +38,6 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -55,6 +54,7 @@
 import com.openerp.support.listview.OEListAdapter;
 import com.openerp.util.HTMLHelper;
 import com.openerp.util.TextViewTags;
+import com.openerp.util.controls.ExpandableHeightGridView;
 import com.openerp.util.drawer.DrawerItem;
 
 public class NoteDetail extends BaseFragment {
@@ -69,7 +69,7 @@
 	String mPadURL = "";
 	String mNoteMemo = "";
 	String mMessageBody = "";
-	GridView mNoteGridViewAttach = null;
+	ExpandableHeightGridView mNoteGridViewAttach = null;
 	List<Object> mNotesListAttach = new ArrayList<Object>();
 	OEListAdapter mNoteListAdapterAttach = null;
 	Ir_AttachmentDBHelper mAttachmentDB = null;
@@ -103,8 +103,9 @@
 	private void showNoteDetails(int note_id) {
 		mNoteDetailTitle = (TextView) mView
 				.findViewById(R.id.txvNoteDetailTitle);
-		mNoteGridViewAttach = (GridView) mView
+		mNoteGridViewAttach = (ExpandableHeightGridView) mView
 				.findViewById(R.id.noteGridViewAttach);
+		mNoteGridViewAttach.setExpanded(true);
 		mNoteDetailMemo = (TextView) mView.findViewById(R.id.txvNoteDetailMemo);
 		mNoteTags = (TextView) mView.findViewById(R.id.edtNoteTagsView);
 
@@ -251,7 +252,7 @@
 					NoteComposeActivity.class);
 			Bundle noteArgs = new Bundle();
 			noteArgs.putInt("note_id", mArgument.getInt("note_id"));
-			noteArgs.putString("Attachment", "New");
+			// noteArgs.putString("Attachment", "New");
 			manageNote.putExtras(noteArgs);
 			startActivity(manageNote);
 			return true;