/android/import-contacts

To get this branch, use:
bzr branch http://bzr.ed.am/android/import-contacts

« back to all changes in this revision

Viewing changes to res/layout/doit.xml

  • Committer: edam
  • Date: 2011-05-02 18:28:24 UTC
  • Revision ID: edam@waxworlds.org-20110502182824-acgdi3qfxfzqgely
- fixed logic for vcard field types (home, work, cell, etc) so it works
- updated NEWS and TODO
- rewrote most of ContactsCache, including a new ContactIdentifier class to identify contacts in the cache and new cache building code
- contacts now identified in the same way that Andoid displays them (by name, or organisation, or number, or email, in that order)
- propper handling and support for organisations and titles
- validation of imported contact now done by Importer, not VcfImporter
- separated sanitisation and normalisation (for cache lookups)
- generacised PhoneData, EmailData and AddressData classes
- ContactData is now aware of primary numbers, emails and organisations (defaults to the first prefrred one seen, or the first one seen where none is preferred)

Show diffs side-by-side

added added

removed removed

Lines of Context:
res/layout/doit.xml
21
21
 *
22
22
 * You should have received a copy of the GNU General Public License
23
23
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
24
 
 -->
 
24
-->
25
25
 
26
26
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent">
27
27
 
35
35
 
36
36
                                <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/doit_ready" />
37
37
 
38
 
                                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
39
 
                                <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:weightSum="3">
40
 
                                        <Button android:text="@string/doit_begin" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1" android:id="@+id/doit_begin" />
41
 
                                </LinearLayout>
42
 
 
43
38
                        </LinearLayout>
44
39
 
45
40
                        <RelativeLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/doit_page_2" android:layout_marginLeft="10dp" android:layout_marginRight="10dp">
72
67
 
73
68
                                        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
74
69
 
75
 
                                        <LinearLayout android:id="@+id/doit_closedisplay" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:visibility="gone" >
76
 
                                                <TextView android:id="@+id/doit_alldone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/doit_alldone" android:gravity="center" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dp" android:visibility="gone" />
77
 
                                                <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:weightSum="3">
78
 
                                                        <Button android:text="@string/doit_close" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1" android:id="@+id/doit_close" />
79
 
                                                </LinearLayout>
 
70
                                        <LinearLayout android:id="@+id/doit_abort_disp" android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:weightSum="3">
 
71
                                                <Button android:text="@string/abort" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1" android:id="@+id/abort" />
80
72
                                        </LinearLayout>
81
73
 
 
74
                                        <TextView android:id="@+id/doit_alldone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/doit_alldone" android:gravity="center" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dp" android:visibility="gone" />
 
75
                                        <TextView android:id="@+id/doit_aborted" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/doit_aborted" android:gravity="center" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dp" android:visibility="gone" />
 
76
 
82
77
                                </LinearLayout>
83
78
 
84
79
                        </RelativeLayout>