Commits

Anonymous committed 9c804c8

start sorting layouts

Comments (0)

Files changed (13)

android/placeUvote/bin/classes.dex

Binary file modified.

android/placeUvote/bin/com/placeuvote/puvandroid/R$id.class

Binary file modified.

android/placeUvote/bin/com/placeuvote/puvandroid/R$layout.class

Binary file modified.

android/placeUvote/bin/com/placeuvote/puvandroid/R$string.class

Binary file modified.

android/placeUvote/bin/placeUvote.apk

Binary file modified.

android/placeUvote/bin/resources.ap_

Binary file modified.

android/placeUvote/gen/com/placeuvote/puvandroid/R.java

     }
     public static final class id {
         public static final int btnAddLocation=0x7f050008;
-        public static final int btnBrowser=0x7f05001e;
         public static final int btnCancel=0x7f05000d;
-        public static final int btnEmployer=0x7f05001b;
         public static final int btnPhone=0x7f050018;
         public static final int btnShowList=0x7f050011;
-        public static final int btnTitle=0x7f05001a;
         public static final int btnUpdate=0x7f05000c;
-        public static final int lblAddress=0x7f050023;
+        public static final int chkAnonymous=0x7f05001c;
+        public static final int chkOneChoice=0x7f05001d;
+        public static final int chkPrivate=0x7f05001b;
         public static final int lblContact=0x7f050014;
         public static final int lblDescription=0x7f050005;
         public static final int lblEmail=0x7f050007;
         public static final int lblPhone=0x7f050016;
         public static final int lblPoll=0x7f050001;
         public static final int lblQuestion=0x7f050003;
-        public static final int lblRating=0x7f050021;
+        public static final int lblRating=0x7f05001f;
         public static final int lblTitle=0x7f050009;
-        public static final int lblWebsite=0x7f05001c;
         public static final int mapmain=0x7f05000e;
         public static final int spnLocations=0x7f050010;
         public static final int spnPoll=0x7f050002;
+        public static final int spnPolls=0x7f050022;
         public static final int tblJobs=0x7f050017;
-        public static final int tblPhone=0x7f050028;
-        public static final int tblRating=0x7f050020;
-        public static final int tblWeb=0x7f05001d;
-        public static final int text1=0x7f050029;
-        public static final int txtAddress=0x7f050024;
-        public static final int txtCity=0x7f050025;
+        public static final int tblPolls=0x7f050021;
+        public static final int tblRating=0x7f05001e;
+        public static final int text1=0x7f050023;
         public static final int txtContact=0x7f050015;
         public static final int txtDescription=0x7f05000b;
         public static final int txtEmail=0x7f050006;
         public static final int txtEmployer=0x7f050013;
+        public static final int txtKey=0x7f05001a;
         public static final int txtPhone=0x7f050019;
         public static final int txtQuestion=0x7f050004;
-        public static final int txtRating=0x7f050022;
-        public static final int txtState=0x7f050026;
+        public static final int txtRating=0x7f050020;
         public static final int txtTitle=0x7f05000a;
-        public static final int txtWebsite=0x7f05001f;
-        public static final int txtZIP=0x7f050027;
         public static final int widget28=0x7f050000;
     }
     public static final class layout {
         public static final int addpoll=0x7f030000;
         public static final int editpoll=0x7f030001;
         public static final int main=0x7f030002;
-        public static final int puvdetail=0x7f030003;
-        public static final int puvlist=0x7f030004;
-        public static final int puvpolldetail=0x7f030005;
+        public static final int mapdetail=0x7f030003;
+        public static final int polldetail=0x7f030004;
+        public static final int polllist=0x7f030005;
         public static final int puvrow=0x7f030006;
     }
     public static final class string {

android/placeUvote/res/layout/polldetail.xml

 android:orientation="vertical"
 >
 <!-- android:background="#4000ffff" -->
-<TextView
-android:id="@+id/lblEmployer"
-android:layout_width="wrap_content"
-android:layout_height="wrap_content"
-android:text="Employer"
-android:textStyle="bold"
->
-</TextView>
-<TextView
-android:id="@+id/txtEmployer"
-android:layout_width="300px"
-android:layout_height="wrap_content"
-android:layout_below="@+id/lblEmployer" 
-android:paddingLeft="10px"
->
-<!-- android:background="#ffffffff" --></TextView>
-<TextView
-android:id="@+id/lblContact"
-android:layout_width="300px"
-android:layout_height="wrap_content"
-android:text="Contact"
-android:textStyle="bold"
-android:layout_below="@+id/txtEmployer" 
->
-</TextView>
-<TextView
-android:id="@+id/txtContact"
-android:layout_width="300px"
-android:layout_height="wrap_content"
-android:layout_below="@+id/lblContact" 
-android:paddingLeft="10px"
->
-</TextView>
-<TextView
-android:id="@+id/lblWebsite"
-android:layout_width="300px"
-android:layout_height="wrap_content"
-android:text="Website"
-android:textStyle="bold"
-android:layout_below="@+id/txtContact" 
->
-</TextView>
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/tblWeb" 
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:layout_below="@+id/lblWebsite"
-    >
-     <TableRow 
-          android:layout_width="fill_parent" 
-          android:layout_height="wrap_content"> 
-          	<ImageButton android:text="Dial" android:id="@+id/btnBrowser"/>
-			<TextView
-			android:id="@+id/txtWebsite"
+      <TextView
+			android:id="@+id/txtQuestion"
 			android:layout_width="300px"
 			android:layout_height="wrap_content"
 			android:paddingLeft="10px"
-			>
-			</TextView>
-     </TableRow> 
-</TableLayout>
+			></TextView>  
+<TextView android:id="@+id/txtKey" android:textStyle="bold" android:paddingLeft="10px" 
+android:layout_height="wrap_content" android:text="Key" android:layout_width="300px" 
+		    android:layout_below="@+id/txtQuestion"
+></TextView>
+<CheckBox android:layout_height="wrap_content" android:text="@+id/chkPrivate" 
+android:layout_below="@+id/txtKey" android:id="@+id/chkPrivate" android:layout_width="wrap_content" 
+android:layout_alignLeft="@+id/txtKey"></CheckBox>
+<CheckBox android:layout_height="wrap_content" 
+android:layout_width="wrap_content" 
+android:text="@+id/chkAnonymous" 
+android:id="@+id/chkAnonymous"
+android:layout_below="@+id/chkPrivate"></CheckBox>
+<CheckBox android:layout_height="wrap_content" 
+android:layout_width="wrap_content" 
+android:text="@+id/chkOneChoice" 
+android:id="@+id/chkOneChoice"
+android:layout_below="@+id/chkAnonymous"></CheckBox>
+
+
+
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/tblRating" 
     android:layout_width="fill_parent" 
     android:layout_height="wrap_content" 
-    android:layout_below="@+id/tblWeb"
+    android:layout_below="@+id/chkOneChoice"
     >
      <TableRow 
           android:layout_width="fill_parent" 
 			</TextView>
      </TableRow> 
 </TableLayout>
-<TextView
-android:id="@+id/lblAddress"
-android:layout_width="300px"
-android:layout_height="wrap_content"
-android:text="Address"
-android:textStyle="bold"
-android:layout_below="@+id/tblRating" 
->
-</TextView>
-<TextView
-android:id="@+id/txtAddress"
-android:layout_width="300px"
-android:layout_height="wrap_content"
-android:layout_below="@+id/lblAddress"
-android:paddingLeft="10px"
->
-<!-- android:background="#ffffffff" -->
-</TextView>
-
-<TextView
-android:id="@+id/txtCity"
-android:layout_width="300px"
-android:layout_height="wrap_content"
-android:layout_below="@+id/txtAddress"
-android:paddingLeft="10px"
->
-<!-- android:background="#ffffffff" -->
-</TextView>
-
-<TextView
-android:id="@+id/txtState"
-android:layout_width="300px"
-android:layout_height="wrap_content"
-android:layout_below="@+id/txtCity"
-android:paddingLeft="10px"
->
-<!-- android:background="#ffffffff" -->
-</TextView>
-
-<TextView
-android:id="@+id/txtZIP"
-android:layout_width="300px"
-android:layout_height="wrap_content"
-android:layout_below="@+id/txtState"
-android:paddingLeft="10px"
->
-<!-- android:background="#ffffffff" -->
-</TextView>
-<TextView
-android:id="@+id/lblPhone"
-android:layout_width="300px"
-android:layout_height="wrap_content"
-android:text="Phone"
-android:textStyle="bold"
-android:layout_below="@+id/txtZIP"
->
-</TextView>
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/tblPhone" 
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:layout_below="@+id/lblPhone"
-    >
-     <TableRow 
-          android:layout_width="fill_parent" 
-          android:layout_height="wrap_content"> 
-          	<ImageButton android:text="Dial" android:id="@+id/btnPhone"/>
-			<TextView
-			android:id="@+id/txtPhone"
-			android:layout_width="300px"
-			android:layout_height="wrap_content"
-			android:paddingLeft="10px"
-			>
-			</TextView>
-     </TableRow> 
-</TableLayout>
-<TextView
-android:id="@+id/lblEmail"
-android:layout_width="300px"
-android:layout_height="wrap_content"
-android:text="Email"
-android:textStyle="bold"
-android:layout_below="@+id/tblPhone"
->
-</TextView>
-<TextView
-android:id="@+id/txtEmail"
-android:layout_width="300px"
-android:layout_height="wrap_content"
-android:layout_below="@+id/lblEmail"
-android:paddingLeft="10px"
->
-<!-- android:background="#ffffffff" -->
-</TextView>
+
+
+
+
 </RelativeLayout>

android/placeUvote/src/com/placeuvote/puvandroid/PollDetail.java

     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.puvdetail);
+/** Edit res/layout/polldetail.xml to match these form elements
+ *  - txtEmail, numLocations and numDates not displayed */
+        setContentView(R.layout.polldetail);
         txtKey = (TextView) findViewById(R.id.txtKey);
         chkPrivate = (CheckBox) findViewById(R.id.chkPrivate);
         chkAnonymous = (CheckBox) findViewById(R.id.chkAnonymous);
         chkOneChoice = (CheckBox) findViewById(R.id.chkOneChoice);
-        numLocations = (TextView) findViewById(R.id.numLocations);
-        numDates = (TextView) findViewById(R.id.numDates);
         dateCreatedOn = (TextView) findViewById(R.id.dateCreatedOn);
         txtCreatedBy = (TextView) findViewById(R.id.txtCreatedBy);
         dateLastVote = (TextView) findViewById(R.id.dateLastVote);
         numTotalVotes = (TextView) findViewById(R.id.numTotalVotes);
         txtUser = (TextView) findViewById(R.id.txtUser);
-        txtEmail = (TextView) findViewById(R.id.txtEmail);
         txtQuestion = (TextView) findViewById(R.id.txtQuestion);
 
         // get the poll_id for this poll from the bundle passed by PollList
 		chkPrivate.setChecked(IntToBool(poll.getColPrivate()));
 		chkAnonymous.setChecked(IntToBool(poll.getColAnonymous()));
 		chkOneChoice.setChecked(IntToBool(poll.getColOneChoice()));
-		numLocations.setText(Long.toString(poll.getColLocations()));
-		numDates.setText(Long.toString(poll.getColDates()));
 		dateCreatedOn.setText("Created: " + dateFormat.format(poll.getColCreatedOn()));
 		txtCreatedBy.setText(poll.getColCreatedBy());
 		dateLastVote.setText("Last vote: " + dateFormat.format(poll.getColLastVote()));
 		numTotalVotes.setText(poll.getColTotalVotes());
         txtUser.setText(poll.getColUser());
-        txtEmail.setText(poll.getColEmail());
         txtQuestion.setText(poll.getColQuestion());
 
     }

android/placeUvote/src/com/placeuvote/puvandroid/PollList.java

 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
+import android.widget.Spinner;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TableLayout.LayoutParams;
 
     private static Button btnQuestion;
     private static Button btnPoll;
+    private static Spinner spnPoll;
     static TableLayout tblPolls;
 
 
     };
 
     // Create a button click listener for the Poll button.
-    private final Button.OnClickListener btnPollOnClick = new Button.OnClickListener() {
+    private final Button.OnClickListener spnPollOnClick = new Button.OnClickListener() {
         public void onClick(View v) {
             for (View vw : lstTable) {
                 tblPolls.removeView(vw);
         btnQuestion.setText("Question");
         btnQuestion.setOnClickListener(btnQuestionOnClick);
         spnPoll = (Spinner) findViewById(R.id.spnPolls);
-        btnPoll.setText("Poll");
+        spnPoll.setTag("Poll");
         spnPoll.setOnClickListener(spnPollOnClick);
 
         db = new PUVDatabase(this);

android/placeUvote/src/com/placeuvote/puvandroid/VoterDetail.java

     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.puvpolldetail);
+        setContentView(R.layout.mapdetail);
         voter_id = (Integer) findViewById(R.id._id);
         txtVoter = (TextView) findViewById(R.id.createdby);
         txtKey = (TextView) findViewById(R.id.key);

android/restart_adb.sh

File contents unchanged.

gaepuv/puv/fixtures/uploadcountry.sh

File contents unchanged.