Merge lp:~mrasmus/tomdroid/fix-660116 into lp:~tomdroid-maintainers/tomdroid/main

[Matthew Rasmus]

The TextView in note_view was ignoring the indentation and bullets when wrapping (it would wrap for "Line 1" instead of " <> Line 1"). Changing its layout_width parameter to FILL_PARENT fixed this. Also, if a note began with more than one listItem's, the first item's bullet point would not appear (which has been fixed as well).

[Benoit Garret (benoit.garret)]

Thanks for your work, merged.

Actually, list items at the beginning of a note would have their bullets rendered. The first characters of the note content always are the title and you can't really put lists in there. But the extra check doesn't hurt, so thanks for your eagle eyes.

=== modified file 'res/layout/note_view.xml'
--- res/layout/note_view.xml	2010-09-26 19:57:31 +0000
+++ res/layout/note_view.xml	2010-12-10 19:34:51 +0000
@@ -49,7 +49,7 @@
 		<TextView 
 				  xmlns:android="http://schemas.android.com/apk/res/android"
 				  android:id="@+id/content"
-				  android:layout_width="wrap_content" 
+				  android:layout_width="fill_parent" 
 				  android:layout_height="wrap_content"
 				  android:singleLine="false"
 				  android:text="@string/strWait"

=== modified file 'src/org/tomdroid/xml/NoteContentHandler.java'
--- src/org/tomdroid/xml/NoteContentHandler.java	2010-08-30 16:33:02 +0000
+++ src/org/tomdroid/xml/NoteContentHandler.java	2010-12-10 19:34:51 +0000
@@ -213,7 +213,7 @@
 				inListItem = false;
 				// TODO new sexier bullets?
 				// Show a leading margin that is as wide as the nested level we are in
-				ssb.setSpan(new LeadingMarginSpan.Standard(10*inListLevel), listItemStartPos.get(inListLevel-1), listItemEndPos.get(inListLevel-1), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+				ssb.setSpan(new LeadingMarginSpan.Standard(30*inListLevel), listItemStartPos.get(inListLevel-1), listItemEndPos.get(inListLevel-1), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 				ssb.setSpan(new BulletSpan(), listItemStartPos.get(inListLevel-1), listItemEndPos.get(inListLevel-1), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 				listItemStartPos.set(inListLevel-1, new Integer(0));
 				listItemEndPos.set(inListLevel-1, new Integer(0));
@@ -304,10 +304,12 @@
 				// Book keeping of where the list-items started and where they end
 				// we need to do that because characters() can be called several times for the same tag
 				
-				// if listItem's position not already in tracking array, add it. Otherwise if it equals 0 then set
+				// if listItem's position not already in tracking array, add it.
+				// Otherwise if both the start and end positions equal 0 then set
+				//   (the check on EndPos prevents some issues if a listItem starts at position 0).
 				if (listItemStartPos.size() < inListLevel) {
 					listItemStartPos.add(new Integer(strLenStart));
-				} else if (listItemStartPos.get(inListLevel-1) == 0) {
+				} else if (listItemStartPos.get(inListLevel-1) == 0 && listItemEndPos.get(inListLevel-1) == 0) {
 					listItemStartPos.set(inListLevel-1, new Integer(strLenStart));					
 				}
 				// no matter what, we track the end (we add if array not big enough or set otherwise)