WallyHackenslacker/MASA-Mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix folder routes and package location

Browse Source
This commit is contained in:
Reynaldo Reyes
2016-03-13 23:13:58 -04:30
parent 0a593484b4
commit 67fbbed7c4
25 changed files with 84 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/.name generated
View File

@@ -1 +1 @@
Attendance Scanner Application
masa-mobile

3
.idea/compiler.xml generated
View File

@@ -19,5 +19,4 @@
</profile>
</annotationProcessing>
</component>
</project>
</project>

5
.idea/encodings.xml generated
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
</project>

1
.idea/gradle.xml generated
View File

@@ -5,7 +5,6 @@
<GradleProjectSettings>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
<option name="gradleJvm" value="1.7" />
<option name="modules">
<set>

29
.idea/misc.xml generated
View File

@@ -27,7 +27,36 @@
</value>
</option>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
<component name="masterDetails">
<states>
<state key="ProjectJDKs.UI">
<settings>
<last-edited>1.7</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>

5
.idea/modules.xml generated
View File

@@ -2,9 +2,8 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/AttendanceScannerApplication.iml" filepath="$PROJECT_DIR$/AttendanceScannerApplication.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/masa-mobile.iml" filepath="$PROJECT_DIR$/masa-mobile.iml" />
</modules>
</component>
</project>
</project>

5
.idea/scopes/scope_settings.xml generated
View File

@@ -1,5 +0,0 @@
<component name="DependencyValidationManager">
<state>
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
</state>
</component>

1
.idea/vcs.xml generated
View File

@@ -2,6 +2,5 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/app/build" vcs="Git" />
</component>
</project>

2
app/app.iml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="AttendanceScannerApplication" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="masa-mobile" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>

13
app/src/androidTest/java/com/example/masa/massiveattendancescannerapplication/ApplicationTest.java
View File

@@ -1,13 +0,0 @@
package com.example.masa.massiveattendancescannerapplication;
import android.app.Application;
import android.test.ApplicationTestCase;
/**
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
*/
public class ApplicationTest extends ApplicationTestCase<Application> {
public ApplicationTest() {
super(Application.class);
}
}

16
app/src/main/AndroidManifest.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.masa.massiveattendancescannerapplication" >
package="massiveattendancescannerapplication" >
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.INTERNET"/>
@@ -12,7 +12,7 @@
android:label="@string/app_name"
android:theme="@style/AppTheme" >
<activity
android:name="com.example.masa.massiveattendancescannerapplication.MainActivity"
android:name="massiveattendancescannerapplication.MainActivity"
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -23,26 +23,26 @@
<activity
android:name=".CourseActivity"
android:label="@string/title_course_activity"
android:parentActivityName="com.example.masa.massiveattendancescannerapplication.MainActivity" >
android:parentActivityName="massiveattendancescannerapplication.MainActivity" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.example.masa.massiveattendancescannerapplication.MainActivity" />
android:value="massiveattendancescannerapplication.MainActivity" />
</activity>
<activity
android:name=".SectionActivity"
android:label="@string/title_section_activity"
android:parentActivityName="com.example.masa.massiveattendancescannerapplication.CourseActivity" >
android:parentActivityName="massiveattendancescannerapplication.CourseActivity" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.example.masa.massiveattendancescannerapplication.CourseActivity" />
android:value="massiveattendancescannerapplication.CourseActivity" />
</activity>
<activity
android:name=".StudentActivity"
android:label="@string/title_student_activity"
android:parentActivityName="com.example.masa.massiveattendancescannerapplication.CourseActivity" >
android:parentActivityName="massiveattendancescannerapplication.CourseActivity" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.example.masa.massiveattendancescannerapplication.CourseActivity" />
android:value="massiveattendancescannerapplication.CourseActivity" />
</activity>
</application>

6
app/src/main/java/com/example/masa/massiveattendancescannerapplication/CourseActivity.java → app/src/main/java/massiveattendancescannerapplication/CourseActivity.java
View File

@@ -1,4 +1,4 @@
package com.example.masa.massiveattendancescannerapplication;
package massiveattendancescannerapplication;
import java.io.IOException;
@@ -24,8 +24,8 @@ import android.widget.ListView;
import android.widget.SimpleAdapter;
import android.widget.TextView;
import com.example.masa.massiveattendancescannerapplication.Services.JSONParser;
import com.example.masa.massiveattendancescannerapplication.Services.ServiceHandler;
import massiveattendancescannerapplication.Services.JSONParser;
import massiveattendancescannerapplication.Services.ServiceHandler;
public class CourseActivity extends ListActivity {

3
app/src/main/java/com/example/masa/massiveattendancescannerapplication/Data/Course.java → app/src/main/java/massiveattendancescannerapplication/Data/Course.java
View File

@@ -1,4 +1,4 @@
package com.example.masa.massiveattendancescannerapplication.Data;
package massiveattendancescannerapplication.Data;
import org.json.JSONArray;
import org.json.JSONException;
@@ -7,6 +7,7 @@ import org.json.JSONObject;
import java.util.ArrayList;
import java.util.List;
public class Course{
public String name;

2
app/src/main/java/com/example/masa/massiveattendancescannerapplication/Data/Section.java → app/src/main/java/massiveattendancescannerapplication/Data/Section.java
View File

@@ -1,4 +1,4 @@
package com.example.masa.massiveattendancescannerapplication.Data;
package massiveattendancescannerapplication.Data;
import org.json.JSONArray;
import org.json.JSONException;

2
app/src/main/java/com/example/masa/massiveattendancescannerapplication/Data/Student.java → app/src/main/java/massiveattendancescannerapplication/Data/Student.java
View File

@@ -1,4 +1,4 @@
package com.example.masa.massiveattendancescannerapplication.Data;
package massiveattendancescannerapplication.Data;
import org.json.JSONException;
import org.json.JSONObject;

2
app/src/main/java/com/example/masa/massiveattendancescannerapplication/MainActivity.java → app/src/main/java/massiveattendancescannerapplication/MainActivity.java
View File

@@ -1,4 +1,4 @@
package com.example.masa.massiveattendancescannerapplication;
package massiveattendancescannerapplication;
import android.support.v7.app.ActionBarActivity;
import android.os.Bundle;

2
app/src/main/java/com/example/masa/massiveattendancescannerapplication/ScanActivity.java → app/src/main/java/massiveattendancescannerapplication/ScanActivity.java
View File

@@ -1,4 +1,4 @@
package com.example.masa.massiveattendancescannerapplication;
package massiveattendancescannerapplication;
import android.app.Activity;

6
app/src/main/java/com/example/masa/massiveattendancescannerapplication/SectionActivity.java → app/src/main/java/massiveattendancescannerapplication/SectionActivity.java
View File

@@ -1,4 +1,4 @@
package com.example.masa.massiveattendancescannerapplication;
package massiveattendancescannerapplication;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -23,8 +23,8 @@ import android.widget.SimpleAdapter;
import android.widget.TextView;
import android.widget.Toast;
import com.example.masa.massiveattendancescannerapplication.Services.JSONParser;
import com.example.masa.massiveattendancescannerapplication.Services.ServiceHandler;
import massiveattendancescannerapplication.Services.JSONParser;
import massiveattendancescannerapplication.Services.ServiceHandler;
public class SectionActivity extends ListActivity {

6
app/src/main/java/com/example/masa/massiveattendancescannerapplication/Services/CourseAdapter.java → app/src/main/java/massiveattendancescannerapplication/Services/CourseAdapter.java
View File

@@ -1,4 +1,4 @@
package com.example.masa.massiveattendancescannerapplication.Services;
package massiveattendancescannerapplication.Services;
import android.content.Context;
import android.view.LayoutInflater;
@@ -7,8 +7,8 @@ import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.TextView;
import com.example.masa.massiveattendancescannerapplication.Data.Course;
import com.example.masa.massiveattendancescannerapplication.R;
import massiveattendancescannerapplication.Data.Course;
import massiveattendancescannerapplication.R;
import java.util.ArrayList;

2
app/src/main/java/com/example/masa/massiveattendancescannerapplication/Services/FileReader.java → app/src/main/java/massiveattendancescannerapplication/Services/FileReader.java
View File

@@ -1,4 +1,4 @@
package com.example.masa.massiveattendancescannerapplication.Services;
package massiveattendancescannerapplication.Services;
import android.content.Context;
import android.os.Environment;

6
app/src/main/java/com/example/masa/massiveattendancescannerapplication/Services/JSONParser.java → app/src/main/java/massiveattendancescannerapplication/Services/JSONParser.java
View File

@@ -1,7 +1,7 @@
package com.example.masa.massiveattendancescannerapplication.Services;
package massiveattendancescannerapplication.Services;
import com.example.masa.massiveattendancescannerapplication.Data.Course;
import com.example.masa.massiveattendancescannerapplication.Data.Section;
import massiveattendancescannerapplication.Data.Course;
import massiveattendancescannerapplication.Data.Section;
import java.io.IOException;
import java.util.*;

3
app/src/main/java/com/example/masa/massiveattendancescannerapplication/Services/ServiceHandler.java → app/src/main/java/massiveattendancescannerapplication/Services/ServiceHandler.java
View File

@@ -1,4 +1,5 @@
package com.example.masa.massiveattendancescannerapplication.Services;
package massiveattendancescannerapplication.Services;
import android.util.Log;
import org.apache.http.HttpResponse;

4
app/src/main/java/com/example/masa/massiveattendancescannerapplication/StudentActivity.java → app/src/main/java/massiveattendancescannerapplication/StudentActivity.java
View File

@@ -1,4 +1,4 @@
package com.example.masa.massiveattendancescannerapplication;
package massiveattendancescannerapplication;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -16,7 +16,7 @@ import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.SimpleAdapter;
import com.example.masa.massiveattendancescannerapplication.Services.ServiceHandler;
import massiveattendancescannerapplication.Services.ServiceHandler;
public class StudentActivity extends ListActivity {

1
app/src/main/res/layout/activity_main.xml
View File

@@ -25,5 +25,4 @@
android:layout_below="@+id/textView"
android:layout_centerHorizontal="true" />
</RelativeLayout>

19
masa-mobile.iml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="masa-mobile" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>