Skip to content

Commit d6c02a5

Browse files
ftang1996ftang1996
committed
initial commit
0 parents  commit d6c02a5

35 files changed

+837
-0
lines changed

‎README.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# bruinRun
2+
3+
Hack on the Hill App
4+
Designed to serve as a more accessible form of the popular web app Bruin Walk
5+
This android app will pull from the Bruin Walk server and store information in
6+
our own database.
7+
Users will then be able to search through our database to find information in
8+
an accessible, moible app format.

‎app/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

‎app/build.gradle

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
apply plugin: 'com.android.application'
2+
3+
android {
4+
compileSdkVersion 25
5+
buildToolsVersion "25.0.2"
6+
defaultConfig {
7+
applicationId "hoth.bruinrun"
8+
minSdkVersion 15
9+
targetSdkVersion 25
10+
versionCode 1
11+
versionName "1.0"
12+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
}
14+
buildTypes {
15+
release {
16+
minifyEnabled false
17+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18+
}
19+
}
20+
}
21+
22+
dependencies {
23+
compile fileTree(dir: 'libs', include: ['*.jar'])
24+
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
25+
exclude group: 'com.android.support', module: 'support-annotations'
26+
})
27+
compile 'com.android.support:appcompat-v7:25.1.1'
28+
testCompile 'junit:junit:4.12'
29+
}

‎app/proguard-rules.pro

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Add project specific ProGuard rules here.
2+
# By default, the flags in this file are appended to flags specified
3+
# in /Users/Fiona/Library/Android/sdk/tools/proguard/proguard-android.txt
4+
# You can edit the include path and order by changing the proguardFiles
5+
# directive in build.gradle.
6+
#
7+
# For more details, see
8+
# http://developer.android.com/guide/developing/tools/proguard.html
9+
10+
# Add any project specific keep options here:
11+
12+
# If your project uses WebView with JS, uncomment the following
13+
# and specify the fully qualified class name to the JavaScript interface
14+
# class:
15+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
16+
# public *;
17+
#}

‎app/src/androidTest/java/hoth/bruinrun/ExampleInstrumentedTest.java

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package hoth.bruinrun;
2+
3+
import android.content.Context;
4+
import android.support.test.InstrumentationRegistry;
5+
import android.support.test.runner.AndroidJUnit4;
6+
7+
import org.junit.Test;
8+
import org.junit.runner.RunWith;
9+
10+
import static org.junit.Assert.*;
11+
12+
/**
13+
* Instrumentation test, which will execute on an Android device.
14+
*
15+
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
16+
*/
17+
@RunWith(AndroidJUnit4.class)
18+
public class ExampleInstrumentedTest {
19+
@Test
20+
public void useAppContext() throws Exception {
21+
// Context of the app under test.
22+
Context appContext = InstrumentationRegistry.getTargetContext();
23+
24+
assertEquals("hoth.bruinrun", appContext.getPackageName());
25+
}
26+
}

‎app/src/main/AndroidManifest.xml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="hoth.bruinrun">
4+
5+
<application
6+
android:allowBackup="true"
7+
android:icon="@mipmap/ic_launcher"
8+
android:label="@string/app_name"
9+
android:supportsRtl="true"
10+
android:theme="@style/AppTheme">
11+
<activity android:name=".MainActivity">
12+
13+
<intent-filter>
14+
<action android:name="android.intent.action.MAIN" />
15+
16+
<category android:name="android.intent.category.LAUNCHER" />
17+
</intent-filter>
18+
</activity>
19+
<activity android:name=".logIn" />
20+
<activity android:name=".searchList" />
21+
<activity android:name=".professorPage" />
22+
<activity android:name=".classPage"></activity>
23+
24+
</application>
25+
26+
</manifest>

‎app/src/main/java/hoth/bruinrun/MainActivity.java

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package hoth.bruinrun;
2+
3+
import android.content.Intent;
4+
import android.support.v7.app.AppCompatActivity;
5+
import android.os.Bundle;
6+
import android.view.View;
7+
import android.view.animation.Animation;
8+
import android.view.animation.TranslateAnimation;
9+
10+
import static hoth.bruinrun.R.id.imageView;
11+
12+
public class MainActivity extends AppCompatActivity {
13+
14+
@Override
15+
protected void onCreate(Bundle savedInstanceState) {
16+
super.onCreate(savedInstanceState);
17+
setContentView(R.layout.activity_main);
18+
19+
}
20+
public void goToLogin(View view) {
21+
Intent LoginPage = new Intent(MainActivity.this , logIn.class);
22+
startActivity(LoginPage);
23+
}
24+
public void goToSearch(View view) {
25+
Intent SearchPage = new Intent(MainActivity.this , searchList.class);
26+
startActivity(SearchPage);
27+
}
28+
public void goToLogin(View view) {
29+
Intent LoginPage = new Intent(MainActivity.this , logIn.class);
30+
startActivity(LoginPage);
31+
}
32+
public void goToSearch(View view) {
33+
Intent SearchPage = new Intent(MainActivity.this , searchList.class);
34+
startActivity(SearchPage);
35+
}
36+
}

‎app/src/main/java/hoth/bruinrun/classPage.java

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package hoth.bruinrun;
2+
3+
import android.support.v7.app.AppCompatActivity;
4+
import android.os.Bundle;
5+
6+
public class classPage extends AppCompatActivity {
7+
8+
@Override
9+
protected void onCreate(Bundle savedInstanceState) {
10+
super.onCreate(savedInstanceState);
11+
setContentView(R.layout.activity_class_page);
12+
}
13+
}

‎app/src/main/java/hoth/bruinrun/logIn.java

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package hoth.bruinrun;
2+
3+
import android.content.Intent;
4+
import android.support.v7.app.AppCompatActivity;
5+
import android.os.Bundle;
6+
import android.view.View;
7+
8+
import static hoth.bruinrun.R.layout.activity_main;
9+
10+
public class logIn extends AppCompatActivity {
11+
12+
@Override
13+
protected void onCreate(Bundle savedInstanceState) {
14+
super.onCreate(savedInstanceState);
15+
setContentView(R.layout.activity_log_in);
16+
}
17+
public void goToMain(View view) {
18+
Intent MainPage = new Intent(logIn.this , MainActivity.class);
19+
startActivity(MainPage);
20+
}
21+
}

‎app/src/main/java/hoth/bruinrun/professorPage.java

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package hoth.bruinrun;
2+
3+
import android.support.v7.app.AppCompatActivity;
4+
import android.os.Bundle;
5+
6+
public class professorPage extends AppCompatActivity {
7+
8+
@Override
9+
protected void onCreate(Bundle savedInstanceState) {
10+
super.onCreate(savedInstanceState);
11+
setContentView(R.layout.activity_professor_page);
12+
}
13+
}

‎app/src/main/java/hoth/bruinrun/searchList.java

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package hoth.bruinrun;
2+
3+
import android.support.v7.app.AppCompatActivity;
4+
import android.os.Bundle;
5+
6+
public class searchList extends AppCompatActivity {
7+
8+
@Override
9+
protected void onCreate(Bundle savedInstanceState) {
10+
super.onCreate(savedInstanceState);
11+
setContentView(R.layout.activity_search_list);
12+
}
13+
}

‎app/src/main/res/layout/activity_class_page.xml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:id="@+id/activity_class_page"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:paddingBottom="@dimen/activity_vertical_margin"
8+
android:paddingLeft="@dimen/activity_horizontal_margin"
9+
android:paddingRight="@dimen/activity_horizontal_margin"
10+
android:paddingTop="@dimen/activity_vertical_margin"
11+
tools:context="hoth.bruinrun.classPage">
12+
13+
</RelativeLayout>

‎app/src/main/res/layout/activity_log_in.xml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:id="@+id/activity_log_in"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:paddingBottom="@dimen/activity_vertical_margin"
8+
android:paddingLeft="@dimen/activity_horizontal_margin"
9+
android:paddingRight="@dimen/activity_horizontal_margin"
10+
android:paddingTop="@dimen/activity_vertical_margin"
11+
tools:context="hoth.bruinrun.logIn">
12+
13+
<Button
14+
android:text="Back"
15+
android:layout_width="wrap_content"
16+
android:layout_height="wrap_content"
17+
android:layout_alignParentTop="true"
18+
android:layout_alignParentRight="true"
19+
android:layout_alignParentEnd="true"
20+
android:id="@+id/Main"
21+
android:background="@android:color/holo_blue_light"
22+
android:onClick="goToMain"/>
23+
24+
</RelativeLayout>

‎app/src/main/res/layout/activity_main.xml

+129
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:id="@+id/activity_main"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:paddingBottom="@dimen/activity_vertical_margin"
8+
android:paddingLeft="@dimen/activity_horizontal_margin"
9+
android:paddingRight="@dimen/activity_horizontal_margin"
10+
android:paddingTop="@dimen/activity_vertical_margin"
11+
tools:context="hoth.bruinrun.MainActivity"
12+
android:background="@android:color/white">
13+
14+
<Button
15+
android:text="Log In"
16+
android:layout_width="wrap_content"
17+
android:layout_height="wrap_content"
18+
android:layout_alignParentTop="true"
19+
android:layout_alignParentRight="true"
20+
android:layout_alignParentEnd="true"
21+
android:id="@+id/logIn"
22+
android:background="@android:color/holo_blue_light"
23+
android:onClick="goToLogin"/>
24+
25+
<TextView
26+
android:text="@string/app_name"
27+
android:textColor="@android:color/holo_blue_light"
28+
android:textStyle="bold"
29+
android:textSize="80dp"
30+
android:layout_width="wrap_content"
31+
android:layout_height="wrap_content"
32+
android:layout_marginTop="100dp"
33+
android:id="@+id/logo"
34+
tools:fontFamily="sans-serif-condensed"
35+
android:fontFamily="sans-serif-condensed"
36+
android:layout_alignParentTop="true"
37+
android:layout_centerHorizontal="true" />
38+
39+
40+
<TextView
41+
android:text="@string/slogan"
42+
android:textColor="@android:color/darker_gray"
43+
android:textSize="20dp"
44+
android:layout_width="wrap_content"
45+
android:layout_height="wrap_content"
46+
android:id="@+id/slogan"
47+
android:layout_below="@id/logo"
48+
android:layout_centerHorizontal="true"
49+
/>
50+
51+
52+
<<<<<<< HEAD
53+
<<<<<<< HEAD
54+
<SearchView
55+
android:layout_width="wrap_content"
56+
android:layout_height="wrap_content"
57+
android:id="@+id/Search_page_bar"
58+
android:orientation="horizontal"
59+
android:background="@android:color/white"
60+
android:backgroundTint="@android:color/darker_gray"
61+
android:clickable="true"
62+
android:layout_alignParentTop="true"
63+
android:layout_alignParentLeft="true"
64+
android:layout_alignParentStart="true"
65+
android:layout_below="@id/slogan"
66+
android:layout_toLeftOf="@+id/Search_page_button"
67+
android:layout_toStartOf="@+id/Search_page_button" />
68+
69+
=======
70+
=======
71+
>>>>>>> origin/master
72+
<ScrollView
73+
android:layout_width="match_parent"
74+
android:layout_height="match_parent"
75+
android:layout_alignParentBottom="true"
76+
android:layout_alignParentLeft="true"
77+
android:layout_alignParentStart="true"
78+
android:id="@+id/Search_results"
79+
android:scrollbarStyle="insideOverlay"
80+
android:layout_below="@+id/Search_page_bar">
81+
82+
<Button
83+
android:text="Search"
84+
android:layout_width="match_parent"
85+
android:layout_height="wrap_content"
86+
android:layout_below="@+id/slogan"
87+
android:layout_alignRight="@+id/logo"
88+
android:layout_alignEnd="@+id/logo"
89+
android:layout_marginTop="242dp"
90+
android:id="@+id/button2"
91+
android:onClick="goToSearch"/>
92+
</ScrollView>
93+
94+
<LinearLayout
95+
android:layout_width="match_parent"
96+
android:layout_height="wrap_content"
97+
android:orientation="vertical" />
98+
99+
100+
<<<<<<< HEAD
101+
>>>>>>> origin/master
102+
=======
103+
>>>>>>> origin/master
104+
<Button
105+
android:text="@string/button_search"
106+
android:layout_width="wrap_content"
107+
android:layout_height="wrap_content"
108+
android:id="@+id/Search_page_button"
109+
android:layout_below="@id/slogan"
110+
android:layout_alignParentRight="true"
111+
android:layout_alignParentEnd="true"
112+
<<<<<<< HEAD
113+
<<<<<<< HEAD
114+
android:layout_marginTop="30dp"
115+
android:background="@android:color/holo_blue_light"/>
116+
117+
=======
118+
android:id="@+id/Search_page_button"
119+
android:onClick=""/>
120+
>>>>>>> origin/master
121+
=======
122+
android:id="@+id/Search_page_button"
123+
android:onClick=""/>
124+
>>>>>>> origin/master
125+
126+
</RelativeLayout>
127+
128+
129+

0 commit comments

Comments
 (0)