diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0fdd6fd --- /dev/null +++ b/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2011-2015, Berkeley Model United Nations. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of Berkeley Model United Nations nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index c6c55c4..3eac3e5 100644 --- a/app/app.iml +++ b/app/app.iml @@ -84,8 +84,11 @@ + + + diff --git a/app/build.gradle b/app/build.gradle index 3eb9998..9e2c874 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,4 +23,6 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:appcompat-v7:21.0.3' + compile 'com.google.android.gms:play-services-location:6.5.87' + compile 'com.google.android.gms:play-services-maps:6.5.87' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 639636a..8888192 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,10 +12,12 @@ android:label="@string/app_name" > - + diff --git a/app/src/main/res/drawable/letterheadblack.png b/app/src/main/res/drawable/letterheadblack.png new file mode 100644 index 0000000..8734c0a Binary files /dev/null and b/app/src/main/res/drawable/letterheadblack.png differ diff --git a/app/src/main/res/drawable/letterheadwhite.png b/app/src/main/res/drawable/letterheadwhite.png new file mode 100644 index 0000000..780de9f Binary files /dev/null and b/app/src/main/res/drawable/letterheadwhite.png differ diff --git a/app/src/main/res/drawable/letterheadwhite2.png b/app/src/main/res/drawable/letterheadwhite2.png new file mode 100644 index 0000000..1e55f49 Binary files /dev/null and b/app/src/main/res/drawable/letterheadwhite2.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1696649..203c652 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -9,7 +9,12 @@ + android:background="@drawable/background"> + + + android:text="@string/conference_title" + android:textColor="@color/black"/> + android:layout_gravity="center" + android:layout_weight="6" + android:src="@drawable/letterheadblack"/> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..1d98142 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,5 @@ + + + #99FFFFFF + #211f20 + \ No newline at end of file