Skip to content

Commit

Permalink
final commit before submitting
Browse files Browse the repository at this point in the history
  • Loading branch information
aaron-weaver committed Mar 21, 2015
1 parent 33a25da commit 647d0dd
Show file tree
Hide file tree
Showing 165 changed files with 3,215 additions and 3,411 deletions.
Binary file modified .gradle/2.2.1/taskArtifacts/cache.properties.lock
Binary file not shown.
Binary file modified .gradle/2.2.1/taskArtifacts/fileHashes.bin
Binary file not shown.
Binary file modified .gradle/2.2.1/taskArtifacts/fileSnapshots.bin
Binary file not shown.
Binary file modified .gradle/2.2.1/taskArtifacts/taskArtifacts.bin
Binary file not shown.
564 changes: 168 additions & 396 deletions .idea/workspace.xml

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions ContestApp.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module 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" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" 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>

628 changes: 318 additions & 310 deletions app/build/generated/source/r/debug/andronerds/com/contestapp/R.java

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="1.3"><source path="C:\Users\Dilancuan\Documents\d2w\ctapp\contest_app\app\build\intermediates\exploded-aar\com.github.satyan\sugar\1.3\assets"/></dataSet><dataSet config="21.0.3"><source path="C:\Users\Dilancuan\Documents\d2w\ctapp\contest_app\app\build\intermediates\exploded-aar\com.android.support\support-v4\21.0.3\assets"/></dataSet><dataSet config="1.2.1"><source path="C:\Users\Dilancuan\Documents\d2w\ctapp\contest_app\app\build\intermediates\exploded-aar\de.hdodenhof\circleimageview\1.2.1\assets"/></dataSet><dataSet config="21.0.0"><source path="C:\Users\Dilancuan\Documents\d2w\ctapp\contest_app\app\build\intermediates\exploded-aar\com.android.support\cardview-v7\21.0.0\assets"/></dataSet><dataSet config="2.0.1"><source path="C:\Users\Dilancuan\Documents\d2w\ctapp\contest_app\app\build\intermediates\exploded-aar\com.github.gabrielemariotti.cards\cardslib-core\2.0.1\assets"/></dataSet><dataSet config="21.0.3"><source path="C:\Users\Dilancuan\Documents\d2w\ctapp\contest_app\app\build\intermediates\exploded-aar\com.android.support\appcompat-v7\21.0.3\assets"/></dataSet><dataSet config="main"><source path="C:\Users\Dilancuan\Documents\d2w\ctapp\contest_app\app\src\main\assets"/></dataSet><dataSet config="debug"><source path="C:\Users\Dilancuan\Documents\d2w\ctapp\contest_app\app\src\debug\assets"/></dataSet></merger>
<merger version="3"><dataSet config="1.3"><source path="/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.github.satyan/sugar/1.3/assets"/></dataSet><dataSet config="21.0.3"><source path="/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/assets"/></dataSet><dataSet config="1.2.1"><source path="/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/de.hdodenhof/circleimageview/1.2.1/assets"/></dataSet><dataSet config="21.0.0"><source path="/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/cardview-v7/21.0.0/assets"/></dataSet><dataSet config="2.0.1"><source path="/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.github.gabrielemariotti.cards/cardslib-core/2.0.1/assets"/></dataSet><dataSet config="21.0.3"><source path="/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/assets"/></dataSet><dataSet config="main"><source path="/home/weava/Projects/ContestApp/app/src/main/assets"/></dataSet><dataSet config="debug"><source path="/home/weava/Projects/ContestApp/app/src/debug/assets"/></dataSet></merger>
4,208 changes: 2,103 additions & 2,105 deletions app/build/intermediates/incremental/mergeResources/debug/merger.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/build/intermediates/res/debug/anim/abc_fade_in.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/decelerate_interpolator"
android:fromAlpha="0.0" android:toAlpha="1.0"
android:duration="@android:integer/config_mediumAnimTime" /><!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/anim/abc_fade_in.xml -->
android:duration="@android:integer/config_mediumAnimTime" /><!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/anim/abc_fade_in.xml -->
2 changes: 1 addition & 1 deletion app/build/intermediates/res/debug/anim/abc_fade_out.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/decelerate_interpolator"
android:fromAlpha="1.0" android:toAlpha="0.0"
android:duration="@android:integer/config_mediumAnimTime" /><!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/anim/abc_fade_out.xml -->
android:duration="@android:integer/config_mediumAnimTime" /><!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/anim/abc_fade_out.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
android:interpolator="@android:anim/decelerate_interpolator"
android:fromYDelta="50%p" android:toYDelta="0"
android:duration="@android:integer/config_mediumAnimTime"/>
<!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/anim/abc_slide_in_bottom.xml -->
<!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/anim/abc_slide_in_bottom.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
<translate xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/decelerate_interpolator"
android:fromYDelta="-50%p" android:toYDelta="0"
android:duration="@android:integer/config_mediumAnimTime"/><!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/anim/abc_slide_in_top.xml -->
android:duration="@android:integer/config_mediumAnimTime"/><!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/anim/abc_slide_in_top.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
<translate xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/accelerate_interpolator"
android:fromYDelta="0" android:toYDelta="50%p"
android:duration="@android:integer/config_mediumAnimTime"/><!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/anim/abc_slide_out_bottom.xml -->
android:duration="@android:integer/config_mediumAnimTime"/><!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/anim/abc_slide_out_bottom.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
<translate xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/accelerate_interpolator"
android:fromYDelta="0" android:toYDelta="-50%p"
android:duration="@android:integer/config_mediumAnimTime"/><!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/anim/abc_slide_out_top.xml -->
android:duration="@android:integer/config_mediumAnimTime"/><!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/anim/abc_slide_out_top.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
<item android:state_accelerated="false" android:color="@color/background_material_dark" />
<item android:color="@android:color/transparent" />
</selector>
<!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_background_cache_hint_selector_material_dark.xml -->
<!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_background_cache_hint_selector_material_dark.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
<item android:state_accelerated="false" android:color="@color/background_material_light" />
<item android:color="@android:color/transparent" />
</selector>
<!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_background_cache_hint_selector_material_light.xml -->
<!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_background_cache_hint_selector_material_light.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
<item android:state_enabled="false" android:color="@color/bright_foreground_disabled_material_dark"/>
<item android:color="@color/bright_foreground_material_dark"/>
</selector>
<!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_primary_text_disable_only_material_dark.xml -->
<!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_primary_text_disable_only_material_dark.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
<item android:state_enabled="false" android:color="@color/bright_foreground_disabled_material_light"/>
<item android:color="@color/bright_foreground_material_light"/>
</selector>
<!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_primary_text_disable_only_material_light.xml -->
<!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_primary_text_disable_only_material_light.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
<item android:state_enabled="false" android:color="@color/primary_text_disabled_material_dark"/>
<item android:color="@color/primary_text_default_material_dark"/>
</selector>
<!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_primary_text_material_dark.xml -->
<!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_primary_text_material_dark.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
<item android:state_enabled="false" android:color="@color/primary_text_disabled_material_light"/>
<item android:color="@color/primary_text_default_material_light"/>
</selector>
<!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_primary_text_material_light.xml -->
<!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_primary_text_material_light.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
<item android:state_pressed="true" android:color="@color/abc_search_url_text_pressed"/>
<item android:state_selected="true" android:color="@color/abc_search_url_text_selected"/>
<item android:color="@color/abc_search_url_text_normal"/>
</selector><!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_search_url_text.xml -->
</selector><!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_search_url_text.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
<item android:state_enabled="false" android:color="@color/secondary_text_disabled_material_dark"/>
<item android:color="@color/secondary_text_default_material_dark"/>
</selector>
<!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_secondary_text_material_dark.xml -->
<!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_secondary_text_material_dark.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
<item android:state_enabled="false" android:color="@color/secondary_text_disabled_material_light"/>
<item android:color="@color/secondary_text_default_material_light"/>
</selector>
<!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_secondary_text_material_light.xml -->
<!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/color/abc_secondary_text_material_light.xml -->
Binary file modified app/build/intermediates/res/debug/drawable-hdpi-v4/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:drawable="@drawable/abc_btn_check_to_on_mtrl_015" />
<item android:drawable="@drawable/abc_btn_check_to_on_mtrl_000" />
</selector><!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_btn_check_material.xml -->
</selector><!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_btn_check_material.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:drawable="@drawable/abc_btn_radio_to_on_mtrl_015" />
<item android:drawable="@drawable/abc_btn_radio_to_on_mtrl_000" />
</selector><!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_btn_radio_material.xml -->
</selector><!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_btn_radio_material.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@android:color/white" />
</shape><!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_cab_background_internal_bg.xml -->
</shape><!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_cab_background_internal_bg.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
android:paddingMode="stack">
<item android:drawable="@drawable/abc_cab_background_internal_bg" />
<item android:drawable="@drawable/abc_cab_background_top_mtrl_alpha" />
</layer-list><!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_cab_background_top_material.xml -->
</layer-list><!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_cab_background_top_material.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
</selector>

</inset>
<!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_edit_text_material.xml -->
<!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_edit_text_material.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
<item android:state_focused="true" android:drawable="@drawable/abc_list_focused_holo" />
<item android:drawable="@android:color/transparent" />
</selector>
<!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_item_background_holo_dark.xml -->
<!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_item_background_holo_dark.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
<item android:state_focused="true" android:drawable="@drawable/abc_list_focused_holo" />
<item android:drawable="@android:color/transparent" />
</selector>
<!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_item_background_holo_light.xml -->
<!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_item_background_holo_light.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
<item android:drawable="@drawable/abc_list_pressed_holo_dark" />
<item android:drawable="@drawable/abc_list_longpressed_holo" />
</transition>
<!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_list_selector_background_transition_holo_dark.xml -->
<!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_list_selector_background_transition_holo_dark.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
<item android:drawable="@drawable/abc_list_pressed_holo_light" />
<item android:drawable="@drawable/abc_list_longpressed_holo" />
</transition>
<!-- From: file:/C:/Users/Dilancuan/Documents/d2w/ctapp/contest_app/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_list_selector_background_transition_holo_light.xml -->
<!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/drawable/abc_list_selector_background_transition_holo_light.xml -->
Loading

0 comments on commit 647d0dd

Please sign in to comment.