Permalink
Browse files

Bringing up-to-date with my local copy - latest app on market

  • Loading branch information...
1 parent dbe01e5 commit 4486c1894381380c64411aace2f4d1acf91105ca @annapowellsmith annapowellsmith committed Jun 15, 2010
@@ -1,3 +1,3 @@
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/filler" android:tileMode="repeat" />
-
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/filler" android:tileMode="repeat" />
+
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
- android:padding="0dip" android:fillViewport="true">
-
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical" android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:padding="0dip">
-
- <TextView android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:text="What is Fix My Street?"
- android:paddingBottom="5dip" android:paddingTop="5dip"
- android:paddingLeft="5dip" android:paddingRight="5dip"
- android:textStyle="bold" />
-
- <TextView android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Fix My Street helps you report problems in your local area - like potholes or broken streetlights - to your council."
- android:paddingBottom="5dip" android:paddingLeft="5dip"
- android:paddingRight="5dip" />
-
- <TextView android:id="@+id/faq" android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Fix My Street is mainly a website, run by mySociety, a project of a registered charity. For more information, see http://www.fixmystreet.com/faq."
- android:paddingBottom="5dip" android:paddingLeft="5dip"
- android:paddingRight="5dip" android:linksClickable="true" />
-
-
- <TextView android:id="@+id/faq" android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="This application is version 0.8 of Fix My Street for Android, written as a volunteer project by Anna Powell-Smith."
- android:paddingBottom="5dip" android:paddingLeft="5dip"
- android:paddingRight="5dip" android:linksClickable="true" />
-
- <TextView android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:text=" "
- android:layout_weight="1" />
-
- <ImageView android:layout_width="fill_parent" android:scaleType="centerCrop"
- android:layout_gravity="bottom" android:layout_height="wrap_content"
- android:src="@drawable/street_background_smaller"></ImageView>
- </LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:padding="0dip" android:fillViewport="true">
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:padding="0dip">
+
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="What is Fix My Street?"
+ android:paddingBottom="5dip" android:paddingTop="5dip"
+ android:paddingLeft="5dip" android:paddingRight="5dip"
+ android:textStyle="bold" />
+
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="Fix My Street helps you report problems in your local area - like potholes or broken streetlights - to your council."
+ android:paddingBottom="5dip" android:paddingLeft="5dip"
+ android:paddingRight="5dip" />
+
+ <TextView android:id="@+id/faq" android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="Fix My Street is mainly a website, run by mySociety, a project of a registered charity. For more information, see http://www.fixmystreet.com/faq."
+ android:paddingBottom="5dip" android:paddingLeft="5dip"
+ android:paddingRight="5dip" android:linksClickable="true" />
+
+
+ <TextView android:id="@+id/faq2" android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text=""
+ android:paddingBottom="5dip" android:paddingLeft="5dip"
+ android:paddingRight="5dip" android:linksClickable="true" />
+
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text=" "
+ android:layout_weight="1" />
+
+ <ImageView android:layout_width="fill_parent" android:scaleType="centerCrop"
+ android:layout_gravity="bottom" android:layout_height="wrap_content"
+ android:src="@drawable/street_background_smaller"></ImageView>
+ </LinearLayout>
+
</ScrollView>
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
- android:fillViewport="true">
-
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical" android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:padding="0dip">
-
- <!-- And a name -->
- <TextView android:id="@+id/name_save" android:layout_width="fill_parent"
- android:paddingTop="5dip" android:paddingLeft="5dip"
- android:paddingRight="5dip" android:layout_height="wrap_content"
- android:text="Short title for problem (you can add more later):" />
-
- <!-- Subject -->
-
- <LinearLayout android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:orientation="horizontal"
- android:padding="5dip">
- <TextView android:id="@+id/subject_label"
- android:layout_width="80sp" android:layout_height="24sp"
- android:text="Title:" />
- <EditText android:id="@+id/subject_text"
- android:layout_width="fill_parent" android:layout_height="40sp"
- android:singleLine="True" android:capitalize="sentences" />
- </LinearLayout>
-
- <!-- And a name -->
- <TextView android:id="@+id/name_save" android:layout_width="fill_parent"
- android:paddingLeft="5dip" android:paddingRight="5dip"
- android:layout_height="wrap_content" android:text="We'll save these for next time:" />
-
- <LinearLayout android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:orientation="horizontal"
- android:padding="5dip">
- <TextView android:id="@+id/name_label" android:layout_width="80sp"
- android:layout_height="24sp" android:text="Your name:" />
- <EditText android:id="@+id/name_text" android:layout_width="fill_parent"
- android:layout_height="40sp" android:singleLine="True"
- android:capitalize="words" />
- </LinearLayout>
-
- <!-- An email address -->
-
- <LinearLayout android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:orientation="horizontal"
- android:padding="5dip">
- <TextView android:id="@+id/email_label"
- android:layout_width="80sp" android:layout_height="24sp"
- android:text="Your email:" />
- <EditText android:id="@+id/email_text" android:layout_width="fill_parent"
- android:layout_height="40sp" android:singleLine="True"
- android:capitalize="none" />
- </LinearLayout>
-
- <Button android:id="@+id/submit_button" android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:text="Save details"
- android:padding="5dip" />
-
- <TextView android:layout_width="fill_parent"
- android:layout_weight="1" android:layout_height="wrap_content"
- android:text=" " />
-
- <ImageView android:layout_width="fill_parent"
- android:scaleType="centerCrop" android:layout_gravity="bottom"
- android:layout_height="wrap_content" android:src="@drawable/street_background_smaller"></ImageView>
- </LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:fillViewport="true">
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:padding="0dip">
+
+ <!-- And a name -->
+ <TextView android:id="@+id/name_save" android:layout_width="fill_parent"
+ android:paddingTop="5dip" android:paddingLeft="5dip"
+ android:paddingRight="5dip" android:layout_height="wrap_content"
+ android:text="Short title for problem (you can add more later):" />
+
+ <!-- Subject -->
+
+ <LinearLayout android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:orientation="horizontal"
+ android:padding="5dip">
+ <TextView android:id="@+id/subject_label"
+ android:layout_width="80sp" android:layout_height="24sp"
+ android:text="Title:" />
+ <EditText android:id="@+id/subject_text"
+ android:layout_width="fill_parent" android:layout_height="40sp"
+ android:singleLine="True" android:capitalize="sentences" />
+ </LinearLayout>
+
+ <!-- And a name -->
+ <TextView android:id="@+id/name_save" android:layout_width="fill_parent"
+ android:paddingLeft="5dip" android:paddingRight="5dip"
+ android:layout_height="wrap_content" android:text="We'll save these for next time:" />
+
+ <LinearLayout android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:orientation="horizontal"
+ android:padding="5dip">
+ <TextView android:id="@+id/name_label" android:layout_width="80sp"
+ android:layout_height="24sp" android:text="Your name:" />
+ <EditText android:id="@+id/name_text" android:layout_width="fill_parent"
+ android:layout_height="40sp" android:singleLine="True"
+ android:capitalize="words" />
+ </LinearLayout>
+
+ <!-- An email address -->
+
+ <LinearLayout android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:orientation="horizontal"
+ android:padding="5dip">
+ <TextView android:id="@+id/email_label"
+ android:layout_width="80sp" android:layout_height="24sp"
+ android:text="Your email:" />
+ <EditText android:id="@+id/email_text" android:layout_width="fill_parent"
+ android:layout_height="40sp" android:singleLine="True"
+ android:capitalize="none" />
+ </LinearLayout>
+
+ <Button android:id="@+id/submit_button" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="Save details"
+ android:padding="5dip" />
+
+ <TextView android:layout_width="fill_parent"
+ android:layout_weight="1" android:layout_height="wrap_content"
+ android:text=" " />
+
+ <ImageView android:layout_width="fill_parent"
+ android:scaleType="centerCrop" android:layout_gravity="bottom"
+ android:layout_height="wrap_content" android:src="@drawable/street_background_smaller"></ImageView>
+ </LinearLayout>
+
</ScrollView>
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
- android:fillViewport="true">
-
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical" android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:padding="0dip"
- android:scrollbars="vertical">
-
- <TextView android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:text="What do I do?"
- android:paddingBottom="5dip" android:paddingTop="5dip"
- android:paddingLeft="5dip" android:paddingRight="5dip"
- android:textStyle="bold" />
-
- <TextView android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:text="@string/instructions"
- android:paddingBottom="5dip" android:paddingLeft="5dip"
- android:paddingRight="5dip" />
-
- <TextView android:id="@+id/faq" android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="For any other questions, see http://www.fixmystreet.com/faq, or email anna@mysociety.org."
- android:paddingBottom="5dip" android:paddingTop="5dip"
- android:paddingLeft="5dip" android:paddingRight="5dip"
- android:textStyle="bold" android:linksClickable="true" />
-
- <TextView android:layout_width="fill_parent" android:layout_weight="1"
- android:layout_height="wrap_content" android:text=" "
- />
-
- <ImageView android:layout_width="fill_parent" android:scaleType="centerCrop"
- android:layout_gravity="bottom" android:layout_height="wrap_content"
- android:src="@drawable/street_background_smaller"></ImageView>
- </LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:fillViewport="true">
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:padding="0dip"
+ android:scrollbars="vertical">
+
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="What do I do?"
+ android:paddingBottom="5dip" android:paddingTop="5dip"
+ android:paddingLeft="5dip" android:paddingRight="5dip"
+ android:textStyle="bold" />
+
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="@string/instructions"
+ android:paddingBottom="5dip" android:paddingLeft="5dip"
+ android:paddingRight="5dip" />
+
+ <TextView android:id="@+id/faq" android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="For any other questions, see http://www.fixmystreet.com/faq, or email anna@mysociety.org."
+ android:paddingBottom="5dip" android:paddingTop="5dip"
+ android:paddingLeft="5dip" android:paddingRight="5dip"
+ android:textStyle="bold" android:linksClickable="true" />
+
+ <TextView android:layout_width="fill_parent" android:layout_weight="1"
+ android:layout_height="wrap_content" android:text=" "
+ />
+
+ <ImageView android:layout_width="fill_parent" android:scaleType="centerCrop"
+ android:layout_gravity="bottom" android:layout_height="wrap_content"
+ android:src="@drawable/street_background_smaller"></ImageView>
+ </LinearLayout>
</ScrollView>
@@ -1,36 +1,44 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
- android:fillViewport="true">
-
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical" android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:paddingTop="10dip">
-
- <Button android:id="@+id/camera_button" android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:text="Take photo"
- android:drawableRight="@drawable/add" />
-
- <Button android:id="@+id/details_button" android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:text="Add details"
- android:drawableRight="@drawable/add" android:paddingRight="10dip"
- android:paddingLeft="10dip" />
-
- <View android:layout_width="1dip" android:layout_height="10dip"
- android:src="@drawable/spacer" />
-
- <Button android:id="@+id/report_button" android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:text="Report to Fix My Street"
- android:paddingRight="10dip" android:paddingLeft="10dip" />
- <TextView android:layout_width="fill_parent" android:layout_weight="1"
- android:layout_height="wrap_content" android:text=" "
- />
-
- <ImageView android:id="@+id/background_image" android:scaleType="centerCrop"
- android:layout_width="fill_parent" android:layout_gravity="bottom"
- android:layout_height="wrap_content" android:src="@drawable/street_background_smaller"></ImageView>
-
- </LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:fillViewport="true">
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:paddingTop="10dip">
+
+ <Button android:id="@+id/camera_button" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="Take photo"
+ android:drawableRight="@drawable/add" />
+
+ <Button android:id="@+id/details_button" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="Add details"
+ android:drawableRight="@drawable/add" android:paddingRight="10dip"
+ android:paddingLeft="10dip" />
+
+ <View android:layout_width="1dip" android:layout_height="10dip"
+ android:src="@drawable/spacer" />
+
+ <TextView android:paddingRight="10dip" android:paddingLeft="10dip"
+ android:layout_width="wrap_content" android:textColor="#87190f"
+ android:id="@+id/progress_text" android:layout_height="wrap_content"
+ android:text="Waiting for a GPS fix... Please make sure you can see the sky." />
+
+ <Button android:id="@+id/report_button" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="Report to Fix My Street"
+ android:paddingRight="10dip" android:paddingLeft="10dip" />
+
+
+ <TextView android:layout_width="fill_parent"
+ android:layout_weight="1" android:layout_height="wrap_content"
+ android:text=" " />
+
+ <ImageView android:id="@+id/background_image"
+ android:scaleType="centerCrop" android:layout_width="fill_parent"
+ android:layout_gravity="bottom" android:layout_height="wrap_content"
+ android:src="@drawable/street_background_smaller"></ImageView>
+
+ </LinearLayout>
+
</ScrollView>
Oops, something went wrong.

0 comments on commit 4486c18

Please sign in to comment.