Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: deepwinter/rhus-android
base: 19253ebe75
...
head fork: deepwinter/rhus-android
compare: 4fcf78951f
  • 2 commits
  • 15 files changed
  • 0 commit comments
  • 1 contributor
View
BIN  .DS_Store
Binary file not shown
View
BIN  res/drawable-mdpi/cancelButtton.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  res/drawable-mdpi/selected_fivepetal.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  res/drawable-mdpi/selected_fourpetal.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  res/drawable-mdpi/selected_manypetal.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  res/drawable-mdpi/selected_sixpetal.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  res/drawable-mdpi/selected_threepetal.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  res/drawable-mdpi/unselected_fivepetal.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  res/drawable-mdpi/unselected_fourpetal.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  res/drawable-mdpi/unselected_manypetal.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  res/drawable-mdpi/unselected_sixpetal.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  res/drawable-mdpi/unselected_threepetal.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  res/drawable-mdpi/uploadButton.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
43 res/layout/map.xml
@@ -49,36 +49,31 @@
android:layout_height="80dp"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
+ android:layout_marginBottom="5dp"
android:layout_marginTop="40dp"
android:background="@drawable/popbackground"
android:gravity="bottom|clip_horizontal" >
- <RelativeLayout
- android:id="@+id/RelativeLayout2"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
- <ImageButton
- android:id="@+id/imageButton2"
- android:layout_width="72dp"
- android:layout_height="57dp"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:layout_marginRight="16dp"
- android:background="@drawable/redbackground"
- android:src="@drawable/everyoneDeselected" />
+ <ImageButton
+ android:id="@+id/imageButton2"
+ android:layout_width="72dp"
+ android:layout_height="57dp"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:background="@null"
+ android:src="@drawable/everyoneDeselected" />
- <ImageButton
- android:id="@+id/ImageButton01"
- android:layout_width="40dp"
- android:layout_height="55dp"
- android:layout_alignBottom="@+id/imageButton2"
- android:layout_alignParentLeft="true"
- android:layout_marginLeft="16dp"
- android:background="@drawable/redbackground"
- android:src="@drawable/myDeselected" />
+ <ImageButton
+ android:id="@+id/ImageButton01"
+ android:layout_width="40dp"
+ android:layout_height="55dp"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="20dp"
+ android:background="@null"
+ android:paddingTop="3dp"
+ android:src="@drawable/myDeselected" />
- </RelativeLayout>
</RelativeLayout>
</RelativeLayout>
View
94 res/layout/submitform.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <EditText
+ android:id="@+id/name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="23dp"
+ android:ems="10"
+ android:inputType="textPersonName" >
+
+ <requestFocus />
+ </EditText>
+
+ <EditText
+ android:id="@+id/comments"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignLeft="@+id/name"
+ android:layout_below="@+id/name"
+ android:layout_marginTop="30dp"
+ android:ems="10"
+ android:inputType="textMultiLine" />
+
+ <ImageButton
+ android:id="@+id/submit_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
+ android:layout_marginBottom="52dp"
+ android:layout_marginRight="32dp"
+ android:background="@null"
+ android:src="@drawable/uploadButton" />
+
+ <ImageButton
+ android:id="@+id/three_petals"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/comments"
+ android:layout_marginTop="52dp"
+ android:background="@null"
+ android:src="@drawable/unselected_threepetal" />
+
+ <ImageButton
+ android:id="@+id/cancel_button"
+ android:layout_width="90dp"
+ android:layout_height="wrap_content"
+ android:layout_alignLeft="@+id/three_petals"
+ android:layout_alignTop="@+id/submit_button"
+ android:background="@null"
+ android:src="@drawable/cancelButtton" />
+
+ <ImageButton
+ android:id="@+id/four_petals"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignRight="@+id/cancel_button"
+ android:layout_alignTop="@+id/three_petals"
+ android:background="@null"
+ android:src="@drawable/unselected_fourpetal" />
+
+ <ImageButton
+ android:id="@+id/five_petals"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignTop="@+id/four_petals"
+ android:layout_centerHorizontal="true"
+ android:background="@null"
+ android:src="@drawable/unselected_fivepetal" />
+
+ <ImageButton
+ android:id="@+id/six_petals"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignLeft="@+id/submit_button"
+ android:layout_alignTop="@+id/five_petals"
+ android:background="@null"
+ android:src="@drawable/unselected_sixpetal" />
+
+ <ImageButton
+ android:id="@+id/many_petals"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignTop="@+id/six_petals"
+ android:layout_toRightOf="@+id/comments"
+ android:background="@null"
+ android:src="@drawable/unselected_manypetal" />
+
+</RelativeLayout>

No commit comments for this range

Something went wrong with that request. Please try again.