/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: 2009-01-11 12:58:54 UTC
  • Revision ID: edam@waxworlds.org-20090111125854-u8ofzso4jatk12me
- added "all done" message
- rewrote Importer.finish() to make the exit process more consistent
- moved Doit's message definitions to Doit
- ensure the importer is destroyed in Doit.onPause()
- only show the toaster popup if a) there is an importer to abort, and b) the abort actually did something (i.e., it's not already aborted)
- bugfix: added some checks for abortion to the Importer after wait()ing after a dialog. Importer.wake() now alsy does a notify() to break out of dialog waits.
- also, made Importer.checkAbort() protected, so it can be checked from specific importers as desired

Show diffs side-by-side

added added

removed removed

Lines of Context:
res/layout/doit.xml
1
1
<?xml version="1.0" encoding="utf-8"?>
2
 
 
3
 
<!--
4
 
 * doit.xml
5
 
 *
6
 
 * Copyright (C) 2009 Tim Marston <edam@waxworlds.org>
7
 
 *
8
 
 * This file is part of the Import Contacts program (hereafter referred
9
 
 * to as "this program"). For more information, see
10
 
 * http://www.waxworlds.org/edam/software/android/import-contacts
11
 
 *
12
 
 * This program is free software: you can redistribute it and/or modify
13
 
 * it under the terms of the GNU General Public License as published by
14
 
 * the Free Software Foundation, either version 3 of the License, or
15
 
 * (at your option) any later version.
16
 
 *
17
 
 * This program is distributed in the hope that it will be useful,
18
 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19
 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
20
 
 * GNU General Public License for more details.
21
 
 *
22
 
 * You should have received a copy of the GNU General Public License
23
 
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
24
 
-->
25
 
 
26
2
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent">
27
3
 
28
 
        <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" >
29
 
                <LinearLayout android:layout_height="fill_parent" android:orientation="vertical" android:layout_width="fill_parent">
30
 
 
31
 
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/doit_title" android:textAppearance="?android:attr/textAppearanceMedium" />
32
 
                        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="20dp"/>
33
 
 
34
 
                        <LinearLayout android:id="@+id/doit_page_1" android:layout_height="wrap_content" android:layout_width="fill_parent" android:orientation="vertical">
35
 
 
36
 
                                <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/doit_ready" />
37
 
 
 
4
        <LinearLayout android:layout_height="wrap_content" android:orientation="vertical" android:layout_weight="1" android:layout_width="fill_parent">
 
5
 
 
6
                <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/doit_title" android:textAppearance="?android:attr/textAppearanceMedium" />
 
7
                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="20dp"/>
 
8
 
 
9
                <LinearLayout android:id="@+id/doit_page_1" android:layout_height="wrap_content" android:layout_width="fill_parent" android:orientation="vertical">
 
10
 
 
11
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/doit_ready" />
 
12
 
 
13
                        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
14
                        <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:weightSum="3">
 
15
                                <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" />
38
16
                        </LinearLayout>
39
17
 
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">
41
 
 
42
 
                                <ProgressBar android:id="@+id/doit_progress" style="?android:attr/progressBarStyleHorizontal" android:layout_height="wrap_content" android:layout_width="fill_parent" />
43
 
                                <TextView android:id="@+id/doit_percentage" android:layout_below="@id/doit_progress" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
44
 
                                <TextView android:id="@+id/doit_outof" android:layout_below="@id/doit_progress" android:layout_alignRight="@id/doit_progress" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
45
 
 
46
 
                                <LinearLayout android:layout_below="@id/doit_percentage" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical">
47
 
                                        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
48
 
 
49
 
                                        <TableLayout android:layout_width="wrap_content" android:layout_height="wrap_content">
50
 
                                                <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
51
 
                                                        <TextView android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/doit_creates" />
52
 
                                                        <TextView android:id="@+id/doit_creates" android:layout_width="wrap_content" android:layout_height="wrap_content" />
53
 
                                                </TableRow>
54
 
                                                <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
55
 
                                                        <TextView android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/doit_overwrites" />
56
 
                                                        <TextView android:id="@+id/doit_overwrites" android:layout_width="wrap_content" android:layout_height="wrap_content" />
57
 
                                                </TableRow>
58
 
                                                <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
59
 
                                                        <TextView android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/doit_merges" />
60
 
                                                        <TextView android:id="@+id/doit_merges" android:layout_width="wrap_content" android:layout_height="wrap_content" />
61
 
                                                </TableRow>
62
 
                                                <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
63
 
                                                        <TextView android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/doit_skips" />
64
 
                                                        <TextView android:id="@+id/doit_skips" android:layout_width="wrap_content" android:layout_height="wrap_content" />
65
 
                                                </TableRow>
66
 
                                        </TableLayout>
67
 
 
68
 
                                        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
69
 
 
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" />
 
18
                </LinearLayout>
 
19
 
 
20
                <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">
 
21
 
 
22
                        <ProgressBar android:id="@+id/doit_progress" style="?android:attr/progressBarStyleHorizontal" android:layout_height="wrap_content" android:layout_width="fill_parent" />
 
23
                        <TextView android:id="@+id/doit_percentage" android:layout_below="@id/doit_progress" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
 
24
                        <TextView android:id="@+id/doit_outof" android:layout_below="@id/doit_progress" android:layout_alignRight="@id/doit_progress" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
 
25
 
 
26
                        <LinearLayout android:layout_below="@id/doit_percentage" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical">
 
27
                                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
28
 
 
29
                                <TableLayout android:layout_width="wrap_content" android:layout_height="wrap_content">
 
30
                                        <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
 
31
                                                <TextView android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/doit_creates" />
 
32
                                                <TextView android:id="@+id/doit_creates" android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
33
                                        </TableRow>
 
34
                                        <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
 
35
                                                <TextView android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/doit_overwrites" />
 
36
                                                <TextView android:id="@+id/doit_overwrites" android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
37
                                        </TableRow>
 
38
                                        <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
 
39
                                                <TextView android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/doit_merges" />
 
40
                                                <TextView android:id="@+id/doit_merges" android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
41
                                        </TableRow>
 
42
                                        <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
 
43
                                                <TextView android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/doit_skips" />
 
44
                                                <TextView android:id="@+id/doit_skips" android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
45
                                        </TableRow>
 
46
                                </TableLayout>
 
47
 
 
48
                                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
49
 
 
50
                                <LinearLayout android:id="@+id/doit_closedisplay" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:visibility="gone" >
 
51
                                        <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" />
 
52
                                        <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:weightSum="3">
 
53
                                                <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" />
72
54
                                        </LinearLayout>
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
 
 
77
55
                                </LinearLayout>
78
56
 
79
 
                        </RelativeLayout>
80
 
 
81
 
                </LinearLayout>
82
 
        </ScrollView>
 
57
                        </LinearLayout>
 
58
 
 
59
                </RelativeLayout>
 
60
 
 
61
        </LinearLayout>
83
62
 
84
63
        <LinearLayout android:orientation="horizontal" android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="right" android:background="@android:drawable/bottom_bar" android:weightSum="3">
85
64
                <Button android:id="@+id/back" android:text="@string/back" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1" android:enabled="false"/>