Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
55605f9
Imported Socrata SDK and optimized compatibility with Android in buil…
matt-hernandez Jun 13, 2014
61f80aa
small txt chg
dutchmo Jun 18, 2014
b6254a2
Created basic functionality of breaking an address into a Socrata query
matt-hernandez Jun 18, 2014
ab80ed3
Commented code
matt-hernandez Jun 18, 2014
a54ec7c
Main View -- Dashboard. Laid out all the individual clickable views …
Jun 19, 2014
f49d093
Main View -- Dashboard. Laid out all the individual clickable views …
Jun 19, 2014
c1a17ff
Adding stub activities
Jun 19, 2014
c901928
Initial commit. Added RecycleFlow screen with dummy data
Jun 23, 2014
f40ceef
Commit before new .gitignore file
matt-hernandez Jun 23, 2014
0c32d1b
New .gitignore file
matt-hernandez Jun 23, 2014
578f91d
Removed .idea folder
matt-hernandez Jun 23, 2014
9c6e76b
Removed other gradle and build files
matt-hernandez Jun 23, 2014
dae5ce2
Commit before pull request
matt-hernandez Jun 23, 2014
f2775c9
Remove build folder before pull request
matt-hernandez Jun 23, 2014
4ff4662
Removed Recycle Austin/build before pull request
matt-hernandez Jun 23, 2014
c42c717
Placeholder MainActivity files added before pull request
matt-hernandez Jun 23, 2014
fb4d2cf
Merge pull request #2 from nitinkurian/master
ATXcoder Jun 23, 2014
b0bb5aa
merged changes from Jessica Tyler
dutchmo Jun 25, 2014
1093963
additional merged changes from Jessica Tyler
dutchmo Jun 25, 2014
d805a68
merge changes from matt
dutchmo Jun 26, 2014
c534ea8
merge changes from matt
dutchmo Jun 26, 2014
0bc1a6f
merge changes from matt
dutchmo Jun 26, 2014
9628ac3
re-added settings.gradle
Jun 26, 2014
01fda37
Added module for pure-java services
Jun 27, 2014
ca53381
added project files
Jun 28, 2014
568d298
Added ScheduleActivity.java. Accepts values in the Intent for street…
broccoli Jul 1, 2014
aa47ff7
Added activity_schedule.xml. Layout for ScheduleActivity.
broccoli Jul 1, 2014
08e8684
Added schedule_screen_strings.xml. String resources used by Schedule…
broccoli Jul 1, 2014
93db277
Support for unit and functional testing.
dutchmo Jul 2, 2014
a2744e8
Merge pull request #5 from broccoli/schedule_screen
dutchmo Jul 3, 2014
b07f83c
Removed action bar stuff to be consistent with other activities.
dutchmo Jul 3, 2014
c2793a6
Copied over revisions from previous fork
matt-hernandez Jul 14, 2014
6c8cd33
prevent problems with Java 8
Jul 16, 2014
f7948fc
Merge pull request #7 from matt-hernandez/master
dutchmo Jul 16, 2014
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
26 changes: 23 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,24 @@
.gradle
/local.properties
/.idea/workspace.xml
# Android Studio project files
*.iws
.idea/workspace.xml
.idea/tasks.xml
.DS_Store

# generated folders
build/
bin/
gen/
.gradle/

# Local configuration file (sdk path, etc)
local.properties

#built application files
*.apk
*.ap_

# files for the dex VM
*.dex

# Java class files
*.class
2 changes: 1 addition & 1 deletion .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions .idea/libraries/appcompat_v7_19_1_0.xml

This file was deleted.

11 changes: 11 additions & 0 deletions .idea/libraries/hamcrest_core_1_3.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/jsoup_1_7_3.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/junit_4_11.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions .idea/libraries/support_v4_19_1_0.xml

This file was deleted.

17 changes: 4 additions & 13 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Recycle Austin
=============

Android app being developed by the Austin Droid's group (http://www.meetup.com/Austin-Android/) to help Austinites learn about Recycling options and services in their communities.
Android app being developed by the Austin Droid group (http://www.meetup.com/Austin-Android/) to help Austinites learn about Recycling options and services in their communities.
6 changes: 5 additions & 1 deletion Recycle Austin/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
/build
*.gradle
build/
local.properties
.idea/workspace.xml
.DS_Store
39 changes: 15 additions & 24 deletions Recycle Austin/Recycle Austin.iml
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/debug" />
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
Expand All @@ -56,22 +56,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/apk" />
<excludeFolder url="file://$MODULE_DIR$/build/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/res" />
<excludeFolder url="file://$MODULE_DIR$/build/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="appcompat-v7-19.1.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
<orderEntry type="library" exported="" name="jsoup-1.7.3" level="project" />
<orderEntry type="module" module-name="Services" exported="" />
</component>
</module>

12 changes: 6 additions & 6 deletions Recycle Austin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ apply plugin: 'android'

android {
compileSdkVersion 19
buildToolsVersion "19.1.0"

buildToolsVersion '19.1.0'
defaultConfig {
minSdkVersion 8
minSdkVersion 11
targetSdkVersion 19
versionCode 1
versionName "1.0"
versionName '1.0'
}
buildTypes {
release {
runProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
productFlavors {
}
}

dependencies {
compile project(':Services')
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:support-v4:19.1.0'
compile 'com.android.support:appcompat-v7:19.1.0'
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
package com.austindroids.recycleaustin.activities;

import android.content.ComponentName;
import android.content.Intent;
import android.test.suitebuilder.annotation.SmallTest;
import android.widget.AdapterView;
import android.widget.GridView;
import android.widget.ListAdapter;

import com.austindroids.recycleaustin.R;


/**
* Provides unit testing of an Activity. This test creates the Activity in isolation, and provides it with a context.
*
* @author Dutch
*/
public class MainActivityUnitTest extends
android.test.ActivityUnitTestCase<MainActivity> {

private int gridviewId;
private MainActivity activity;

public MainActivityUnitTest() {
super(MainActivity.class);
}

@Override
protected void setUp() throws Exception {
super.setUp();
Intent intent = new Intent(getInstrumentation().getTargetContext(),
MainActivity.class);
startActivity(intent, null, null);
activity = getActivity();
}

@SmallTest
public void testLayout() {
gridviewId = R.id.dashboard_grid;
assertNotNull(activity.findViewById(gridviewId));
GridView view = (GridView) activity.findViewById(gridviewId);

assertEquals("Incorrect stretchmode", GridView.STRETCH_COLUMN_WIDTH, view.getStretchMode());
}

@SmallTest
public void testIntentTriggerViaOnClick() {
int position = 1;
assertNotNull(activity);
GridView gridview = (GridView) activity.findViewById(R.id.dashboard_grid);
ListAdapter adapter = gridview.getAdapter();


gridview.setSelection(position);
assertEquals(position, gridview.getSelectedItemPosition());

AdapterView.OnItemClickListener listener = (AdapterView.OnItemClickListener) activity;

gridview.performItemClick(
gridview.getAdapter().getView(position, null, null),
position,
gridview.getAdapter().getItemId(position));

// TouchUtils cannot be used, only allowed in
// InstrumentationTestCase or ActivityInstrumentationTestCase2

// Check the intent which was started
Intent triggeredIntent = getStartedActivityIntent();
ComponentName className = triggeredIntent.getComponent();
assertEquals("Activity doesn't match",
"com.austindroids.recycleaustin.activities.RecycleLocationsActivity",
className.getClassName());
}
}
Loading