Skip to content

11/1 pull request - camera & acreage code #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pgohierpurdue wants to merge 14 commits into
base: master
Choose a base branch
from
Open

11/1 pull request - camera & acreage code #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9a1ae75
bounding box
Oct 24, 2013
956bb1e
second demo changes
Oct 29, 2013
fc447d7
commit
AymanKh Nov 12, 2013
c9922aa
commit Merge branch 'master' of https://github.com/cyrusbowman/FieldN…
AymanKh Nov 12, 2013
a0e3e7d
Commit
AymanKh Nov 19, 2013
220f12e
fkjn
AymanKh Nov 22, 2013
b3329f2
Merge branch 'master' of https://github.com/cyrusbowman/FieldNotebook
AymanKh Nov 22, 2013
3bccabc
jhjh
AymanKh Nov 22, 2013
ee436c5
ok
sanoel Nov 22, 2013
7f62d22
k
sanoel Nov 22, 2013
9570cee
Merge branch 'master' of https://github.com/cyrusbowman/FieldNotebook
sanoel Nov 22, 2013
acd4f17
Merge branch 'master' of https://github.com/cyrusbowman/FieldNotebook
sanoel Dec 3, 2013
305ba20
demo ready
sanoel Dec 4, 2013
8840464
demo fixes
sanoel Dec 4, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions FieldNotebook/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="17" />
android:targetSdkVersion="18" />

<uses-feature
android:glEsVersion="0x00020000"
Expand Down Expand Up @@ -41,7 +41,11 @@
</activity>
<meta-data
android:name="com.google.android.maps.v2.API_KEY"
android:value="AIzaSyAsgWP-_VmfZg9Gy99om8C-0CYQdLp043w" />
android:value="AIzaSyBdeI8o1yoFSz6ckRB1_czLCiuXv7FPuzI" />

<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
</application>

</manifest>
2 changes: 1 addition & 1 deletion FieldNotebook/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-15
target=Google Inc.:Google APIs:19
android.library.reference.1=../../android-maps-extensions/android-maps-extensions
Binary file added FieldNotebook/res/drawable-hdpi/add_picture.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added FieldNotebook/res/drawable-hdpi/device_access_camera.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion FieldNotebook/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<fragment
android:id="@+id/map"
android:name="pl.mg6.android.maps.extensions.SupportMapFragment"
android:name="com.google.android.gms.maps.SupportMapFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />

Expand Down
13 changes: 0 additions & 13 deletions FieldNotebook/res/layout/field.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,5 @@
android:layout_below="@+id/field_row1"
android:layout_alignParentLeft="true"
android:layout_marginTop="5dp">
<TextView
android:id="@+id/field_txtAcres"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:textSize="18sp"
android:paddingLeft="7dp"
android:singleLine="true"
android:text="# Acres"
android:textColor="#000"
android:paddingBottom="20dp"
/>
</RelativeLayout>
</RelativeLayout>
45 changes: 16 additions & 29 deletions FieldNotebook/res/layout/fragment_add_field.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,19 @@
<Space
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="20" />
<EditText
android:id="@+id/add_field_name"
android:layout_width="0dp"
android:layout_height="48dp"
android:hint="Field Name"
android:layout_weight="60"
/>
android:layout_weight="20" />

<EditText
android:id="@+id/add_field_name"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="60"
android:ems="10"
android:hint="Case Name" >

<requestFocus />
</EditText>

<Space
android:layout_width="0dp"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -68,25 +73,7 @@
android:layout_toRightOf="@+id/add_field_done"
android:layout_toLeftOf="@+id/add_field_undo"
android:layout_below="@+id/add_field_lay_row1"
android:gravity="center">

<CheckBox
android:id="@+id/add_field_chkAutoAcres"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:checked="true"
/>
<EditText
android:id="@+id/add_field_etAcres"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:hint="Acres"
android:text="59 ac"
android:inputType="numberDecimal"
android:digits="0123456789"
android:enabled="false"
/>

</LinearLayout>

android:gravity="center"
android:orientation="horizontal">
</LinearLayout>
</RelativeLayout>
149 changes: 75 additions & 74 deletions FieldNotebook/res/layout/fragment_drawing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,81 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:background="#EEE">
android:background="#EEE"
android:clickable="true" >

<RelativeLayout
android:id="@+id/fragment_drawing_row1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1">
<ImageButton
android:id="@+id/fragment_drawing_butPoint"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerInParent="true"
android:src="@drawable/add_point_v1"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1">
<ImageButton
android:id="@+id/fragment_drawing_butLine"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerInParent="true"
android:src="@drawable/add_line_v1"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1">
<ImageButton
android:id="@+id/fragment_drawing_butPolygon"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerInParent="true"
android:src="@drawable/add_polygon"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1">
<ImageButton
android:id="@+id/fragment_drawing_butColor"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerInParent="true"
android:src="@drawable/select_color"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1">
<ImageButton
android:id="@+id/fragment_drawing_butPicture"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerInParent="true"
android:src="@drawable/select_color"
/>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginBottom="5dp"
android:layout_marginTop="5dp" >

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="horizontal" >

<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1" >

<ImageButton
android:id="@+id/fragment_drawing_butPoint"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerInParent="true"
android:src="@drawable/add_point_v1" />
</RelativeLayout>

<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1" >

<ImageButton
android:id="@+id/fragment_drawing_butLine"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerInParent="true"
android:src="@drawable/add_line_v1" />
</RelativeLayout>

<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1" >

<ImageButton
android:id="@+id/fragment_drawing_butPolygon"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerInParent="true"
android:src="@drawable/add_polygon" />
</RelativeLayout>

<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1" >

<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1" >

<ImageButton
android:id="@+id/note_take_picture"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerInParent="true"
android:src="@drawable/device_access_camera" />
</RelativeLayout>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>

</RelativeLayout>
22 changes: 1 addition & 21 deletions FieldNotebook/res/layout/fragment_sidebar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,26 +61,6 @@
android:layout_alignParentLeft="true"
android:layout_below="@+id/sidebar_layTitleRow1"
android:paddingBottom ="10dp" >
<TextView
android:id="@+id/sidebar_tvAcres"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="30dp"
android:layout_marginRight="7dp"
android:textSize="20sp"
android:text="84"
/>
<TextView
android:id="@+id/sidebar_label_acres"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_toRightOf="@+id/sidebar_tvAcres"
android:textSize="20sp"
android:text="acres"
/>
</RelativeLayout>
</RelativeLayout>
<RelativeLayout
Expand Down Expand Up @@ -115,7 +95,7 @@
android:layout_alignParentLeft="true"
android:textStyle="bold"
android:textSize="24sp"
android:text="Fields"
android:text="Case Files"
/>
<ImageButton
android:id="@+id/sidebar_butAddField"
Expand Down
Loading