Skip to content

Commit 187acd9

Browse files
andrewsosaandrewsosa
committed
Changes package. Also Schedule works now.
sorry not sorry.
1 parent 4df8f0b commit 187acd9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+729
-571
lines changed

‎CONTRIBUTORS.md

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Andrew Sosa : [email protected]
2+
Jonathan Clow

‎README.md

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# HackFSU Android App
2+
`com.hackfsu.mobile.android`
3+
4+
The HackFSU Android app is an open-source, easily configurable software package
5+
to be shared by the hacker community.
6+
7+
## Package Structure
8+
9+
> `com.hackfsu.mobile.android.app.*`
10+
11+
These sub-packages are front-end, UI related packages including Activities,
12+
Fragments, Adapters, custom UI, etc.
13+
14+
> `com.hackfsu.mobile.android.api.*`
15+
16+
These classes are the server-facing, networking elements which connect to
17+
the HackFSU web API.
18+
19+
## `API.java`
20+
21+
The `API.java` class is the primary class to be used by the UI code. This class
22+
contains calls such as `getUpdates()`, `getSchedule()`, etc., which take
23+
`APICallback` objects that will return various models extending the `BaseModel`
24+
abstract class, such as `UpdateModel`, `ScheduleModel`, etc.
25+
26+
An important note about modifying `API.java` is that it uses a private method,
27+
`performCallback(APICallback, <? extends BaseModel>)` to execute the APICallback
28+
as defined in an Activity/Fragment on the UI thread.

‎mobile/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ android {
44
compileSdkVersion 25
55
buildToolsVersion "23.0.3"
66
defaultConfig {
7-
applicationId 'com.hackfsu.android.hackfsu'
7+
applicationId 'com.hackfsu.mobile.android'
88
minSdkVersion 19
99
targetSdkVersion 25
1010
versionCode 9
@@ -25,10 +25,10 @@ android {
2525

2626
dependencies {
2727
compile fileTree(dir: 'libs', include: ['*.jar'])
28-
compile 'com.android.support:appcompat-v7:25.0.1'
29-
compile 'com.android.support:design:25.0.1'
30-
compile 'com.android.support:recyclerview-v7:25.0.1'
31-
compile 'com.android.support:cardview-v7:25.0.1'
28+
compile 'com.android.support:appcompat-v7:25.1.1'
29+
compile 'com.android.support:design:25.1.1'
30+
compile 'com.android.support:recyclerview-v7:25.1.1'
31+
compile 'com.android.support:cardview-v7:25.1.1'
3232
compile 'com.android.support:multidex:1.0.1'
3333
compile 'com.yqritc:recyclerview-flexibledivider:1.2.6'
3434
// Optional, remove if needed.

‎mobile/mobile.iml

+41-35
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,6 @@
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -82,54 +74,68 @@
8274
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8375
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8586
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8687
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8788
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.0.1/jars" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.0.1/jars" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/25.0.1/jars" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/25.0.1/jars" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.1.1/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.1/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/25.1.1/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/25.1.1/jars" />
9293
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/multidex-instrumentation/1.0.1/jars" />
9394
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/multidex/1.0.1/jars" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/25.0.1/jars" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/25.0.1/jars" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/25.0.1/jars" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/25.0.1/jars" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/25.0.1/jars" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/25.0.1/jars" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.0.1/jars" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.0.1/jars" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/transition/25.0.1/jars" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/25.1.1/jars" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/25.1.1/jars" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/25.1.1/jars" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/25.1.1/jars" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/25.1.1/jars" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/25.1.1/jars" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.1.1/jars" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.1.1/jars" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/transition/25.1.1/jars" />
103104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.yqritc/recyclerview-flexibledivider/1.2.6/jars" />
104105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
105106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
106108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
109+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
107111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
108112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
113+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
109114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
115+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
110116
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
111117
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
112118
</content>
113119
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
114120
<orderEntry type="sourceFolder" forTests="false" />
115121
<orderEntry type="library" exported="" scope="TEST" name="multidex-instrumentation-1.0.1" level="project" />
116-
<orderEntry type="library" exported="" name="support-annotations-25.0.1" level="project" />
117-
<orderEntry type="library" exported="" name="design-25.0.1" level="project" />
122+
<orderEntry type="library" exported="" name="design-25.1.1" level="project" />
118123
<orderEntry type="library" exported="" name="okio-1.11.0" level="project" />
119-
<orderEntry type="library" exported="" name="transition-25.0.1" level="project" />
120-
<orderEntry type="library" exported="" name="support-compat-25.0.1" level="project" />
121-
<orderEntry type="library" exported="" name="support-fragment-25.0.1" level="project" />
122-
<orderEntry type="library" exported="" name="animated-vector-drawable-25.0.1" level="project" />
123-
<orderEntry type="library" exported="" name="support-v4-25.0.1" level="project" />
124-
<orderEntry type="library" exported="" name="cardview-v7-25.0.1" level="project" />
124+
<orderEntry type="library" exported="" name="transition-25.1.1" level="project" />
125+
<orderEntry type="library" exported="" name="support-v4-25.1.1" level="project" />
126+
<orderEntry type="library" exported="" name="cardview-v7-25.1.1" level="project" />
127+
<orderEntry type="library" exported="" name="support-compat-25.1.1" level="project" />
125128
<orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />
126129
<orderEntry type="library" exported="" name="okhttp-3.5.0" level="project" />
127-
<orderEntry type="library" exported="" name="support-core-ui-25.0.1" level="project" />
128-
<orderEntry type="library" exported="" name="support-media-compat-25.0.1" level="project" />
129-
<orderEntry type="library" exported="" name="support-vector-drawable-25.0.1" level="project" />
130-
<orderEntry type="library" exported="" name="appcompat-v7-25.0.1" level="project" />
130+
<orderEntry type="library" exported="" name="support-media-compat-25.1.1" level="project" />
131+
<orderEntry type="library" exported="" name="support-core-ui-25.1.1" level="project" />
132+
<orderEntry type="library" exported="" name="appcompat-v7-25.1.1" level="project" />
133+
<orderEntry type="library" exported="" name="recyclerview-v7-25.1.1" level="project" />
131134
<orderEntry type="library" exported="" name="recyclerview-flexibledivider-1.2.6" level="project" />
132-
<orderEntry type="library" exported="" name="recyclerview-v7-25.0.1" level="project" />
133-
<orderEntry type="library" exported="" name="support-core-utils-25.0.1" level="project" />
135+
<orderEntry type="library" exported="" name="support-annotations-25.1.1" level="project" />
136+
<orderEntry type="library" exported="" name="support-vector-drawable-25.1.1" level="project" />
137+
<orderEntry type="library" exported="" name="support-core-utils-25.1.1" level="project" />
138+
<orderEntry type="library" exported="" name="support-fragment-25.1.1" level="project" />
139+
<orderEntry type="library" exported="" name="animated-vector-drawable-25.1.1" level="project" />
134140
</component>
135141
</module>

‎mobile/src/main/AndroidManifest.xml

+8-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.hackfsu.android.app">
3+
package="com.hackfsu.mobile.android.app">
44

55
<uses-permission android:name="android.permission.INTERNET" />
66
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -10,13 +10,13 @@
1010
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
1111

1212
<permission
13-
android:name="com.hackfsu.android.app.permission.C2D_MESSAGE"
13+
android:name="com.hackfsu.mobile.android.app.permission.C2D_MESSAGE"
1414
android:protectionLevel="signature" />
1515

16-
<uses-permission android:name="com.hackfsu.android.hackfsu.permission.C2D_MESSAGE" />
16+
<!--<uses-permission android:name="com.hackfsu.mobile.android.hackfsu.permission.C2D_MESSAGE" />-->
1717

1818
<application
19-
android:name="com.hackfsu.android.app.HackFSU"
19+
android:name="com.hackfsu.mobile.android.app.HackFSU"
2020
android:allowBackup="true"
2121
android:icon="@mipmap/ic_launcher"
2222
android:label="@string/app_name"
@@ -26,7 +26,7 @@
2626
android:resource="@drawable/ic_notification_icon" />
2727

2828
<activity
29-
android:name="com.hackfsu.android.app.activity.MainActivity"
29+
android:name="com.hackfsu.mobile.android.app.activity.MainActivity"
3030
android:label="@string/app_name"
3131
android:theme="@style/AppTheme.NoActionBar">
3232
<intent-filter>
@@ -35,20 +35,11 @@
3535
<category android:name="android.intent.category.LAUNCHER" />
3636
</intent-filter>
3737
</activity>
38-
<activity
39-
android:name="com.hackfsu.android.app.activity.HelpActivity"
40-
android:label="@string/title_activity_help"
41-
android:parentActivityName="com.hackfsu.android.app.activity.MainActivity"
42-
android:theme="@style/AppTheme.HelpRequest">
43-
<meta-data
44-
android:name="android.support.PARENT_ACTIVITY"
45-
android:value="com.hackfsu.android.app.activity.MainActivity" />
46-
</activity>
4738

4839
<!--<service android:name="com.parse.PushService" />-->
4940

5041
<!--<receiver-->
51-
<!--android:name="com.hackfsu.android.app.CustomPushReceiver"-->
42+
<!--android:name="com.hackfsu.mobile.android.app.CustomPushReceiver"-->
5243
<!--android:exported="false">-->
5344
<!--<intent-filter>-->
5445
<!--<action android:name="com.parse.push.intent.RECEIVE" />-->
@@ -63,11 +54,11 @@
6354
<!--<action android:name="com.google.android.c2dm.intent.RECEIVE" />-->
6455
<!--<action android:name="com.google.android.c2dm.intent.REGISTRATION" />-->
6556

66-
<!--<category android:name="com.hackfsu.android.hackfsu" />-->
57+
<!--<category android:name="com.hackfsu.mobile.android.hackfsu" />-->
6758
<!--</intent-filter>-->
6859
<!--</receiver>-->
6960

70-
<activity android:name="com.hackfsu.android.app.activity.MapViewActivity"/>
61+
<activity android:name="com.hackfsu.mobile.android.app.activity.MapViewActivity"/>
7162

7263
</application>
7364

‎mobile/src/main/assets/hackfsu17.png

22.4 KB
Loading

‎mobile/src/main/assets/web_hi_res_512.png

27.7 KB
Loading

0 commit comments

Comments
 (0)