Develop (#5)

* Develop (#2) * Added logic to preserve settings when screen is rotated * Cleaned up redundant code, only one listener for each button behavior (click and long click) * Moved sound logic to Sound class to simplify code and make it more reusable.
MattBlanco · Sep 25, 2016 · f4f2afe · f4f2afe
1 parent 2baed03
commit f4f2afe
Show file tree

Hide file tree

Showing 37 changed files with 122 additions and 327 deletions.
diff --git a/.gradle/2.14.1/taskArtifacts/cache.properties.lock b/.gradle/2.14.1/taskArtifacts/cache.properties.lock
diff --git a/.gradle/2.14.1/taskArtifacts/fileHashes.bin b/.gradle/2.14.1/taskArtifacts/fileHashes.bin
diff --git a/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin b/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin
diff --git a/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin b/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin
diff --git a/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin b/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin
diff --git a/...14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/...14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
diff --git a/...4.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/...4.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
diff --git a/...s/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/...s/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/app.iml b/app/app.iml
@@ -82,6 +82,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -97,6 +98,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />

diff --git a/app/build/intermediates/blame/res/debug/single/drawable-hdpi-v4.json b/app/build/intermediates/blame/res/debug/single/drawable-hdpi-v4.json
@@ -91,14 +91,14 @@
         "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_ic_search_api_mtrl_alpha.png",
         "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\drawable-hdpi\\abc_ic_search_api_mtrl_alpha.png"
     },
-    {
-        "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_btn_rating_star_off_mtrl_alpha.png",
-        "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\drawable-hdpi\\abc_btn_rating_star_off_mtrl_alpha.png"
-    },
     {
         "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_list_longpressed_holo.9.png",
         "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\drawable-hdpi\\abc_list_longpressed_holo.9.png"
     },
+    {
+        "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_btn_rating_star_off_mtrl_alpha.png",
+        "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\drawable-hdpi\\abc_btn_rating_star_off_mtrl_alpha.png"
+    },
     {
         "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_list_pressed_holo_dark.9.png",
         "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\drawable-hdpi\\abc_list_pressed_holo_dark.9.png"

diff --git a/app/build/intermediates/blame/res/debug/single/drawable.json b/app/build/intermediates/blame/res/debug/single/drawable.json
@@ -19,14 +19,14 @@
         "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_check_material.xml",
         "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\drawable\\abc_btn_check_material.xml"
     },
-    {
-        "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_radio_material.xml",
-        "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\drawable\\abc_btn_radio_material.xml"
-    },
     {
         "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_light.xml",
         "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\drawable\\abc_list_selector_background_transition_holo_light.xml"
     },
+    {
+        "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_radio_material.xml",
+        "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\drawable\\abc_btn_radio_material.xml"
+    },
     {
         "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_dark.xml",
         "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\drawable\\abc_list_selector_background_transition_holo_dark.xml"

diff --git a/app/build/intermediates/blame/res/debug/single/layout.json b/app/build/intermediates/blame/res/debug/single/layout.json
@@ -19,14 +19,14 @@
         "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\layout\\select_dialog_item_material.xml",
         "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\layout\\select_dialog_item_material.xml"
     },
-    {
-        "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\layout\\notification_template_media.xml",
-        "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\layout\\notification_template_media.xml"
-    },
     {
         "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\layout\\activity_main.xml",
         "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\src\\main\\res\\layout\\activity_main.xml"
     },
+    {
+        "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\layout\\notification_template_media.xml",
+        "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\layout\\notification_template_media.xml"
+    },
     {
         "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_action_bar_view_list_nav_layout.xml",
         "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\layout\\abc_action_bar_view_list_nav_layout.xml"
@@ -91,14 +91,14 @@
         "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_action_menu_item_layout.xml",
         "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\layout\\abc_action_menu_item_layout.xml"
     },
-    {
-        "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\layout\\notification_media_cancel_action.xml",
-        "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\layout\\notification_media_cancel_action.xml"
-    },
     {
         "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\layout\\notification_template_lines.xml",
         "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\layout\\notification_template_lines.xml"
     },
+    {
+        "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\layout\\notification_media_cancel_action.xml",
+        "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\layout\\notification_media_cancel_action.xml"
+    },
     {
         "merged": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\res\\merged\\debug\\layout\\notification_template_big_media.xml",
         "source": "C:\\Users\\Matt\\AndroidStudioProjects\\Soundboard\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\22.2.1\\res\\layout\\notification_template_big_media.xml"

diff --git a/app/build/intermediates/classes/debug/com/example/matt/soundboard/MainActivity$1.class b/app/build/intermediates/classes/debug/com/example/matt/soundboard/MainActivity$1.class
diff --git a/app/build/intermediates/classes/debug/com/example/matt/soundboard/MainActivity.class b/app/build/intermediates/classes/debug/com/example/matt/soundboard/MainActivity.class
diff --git a/app/build/intermediates/classes/debug/com/example/matt/soundboard/Sound.class b/app/build/intermediates/classes/debug/com/example/matt/soundboard/Sound.class
diff --git a/app/build/intermediates/incremental-classes/debug/instant-run-bootstrap.jar b/app/build/intermediates/incremental-classes/debug/instant-run-bootstrap.jar
diff --git a/app/build/intermediates/incremental-runtime-classes/debug/instant-run.jar b/app/build/intermediates/incremental-runtime-classes/debug/instant-run.jar
diff --git a/...intermediates/incremental-verifier/debug/com/example/matt/soundboard/MainActivity$1.class b/...intermediates/incremental-verifier/debug/com/example/matt/soundboard/MainActivity$1.class
diff --git a/...d/intermediates/incremental-verifier/debug/com/example/matt/soundboard/MainActivity.class b/...d/intermediates/incremental-verifier/debug/com/example/matt/soundboard/MainActivity.class
diff --git a/app/build/intermediates/incremental-verifier/debug/com/example/matt/soundboard/Sound.class b/app/build/intermediates/incremental-verifier/debug/com/example/matt/soundboard/Sound.class
diff --git a/app/build/intermediates/instant-run-support/debug/classes.zip b/app/build/intermediates/instant-run-support/debug/classes.zip
diff --git a/app/build/intermediates/instant-run-support/debug/resources.zip b/app/build/intermediates/instant-run-support/debug/resources.zip
diff --git a/app/build/intermediates/res/resources-debug.ap_ b/app/build/intermediates/res/resources-debug.ap_
diff --git a/app/build/intermediates/restart-dex/debug/build-info.xml b/app/build/intermediates/restart-dex/debug/build-info.xml
@@ -4,27 +4,27 @@
     api-level="23"
     density="420dpi"
     format="7"
-    timestamp="148967225313593"
+    timestamp="96520306960817"
     token="-4397244682667360276" >
 
     <task
         name="javac"
-        duration="345" />
+        duration="384" />
     <task
         name="instant-run-dex"
         duration="0" />
     <task
         name="instant-run-transform"
-        duration="276" />
+        duration="257" />
     <task
         name="verifier"
-        duration="66" />
+        duration="98" />
 
     <artifact
         location="C:\Users\Matt\AndroidStudioProjects\Soundboard\app\build\outputs\apk\app-debug.apk"
         type="MAIN" />
 
-    <build timestamp="148967225313593" >
+    <build timestamp="96520306960817" >
         <artifact
             location="C:\Users\Matt\AndroidStudioProjects\Soundboard\app\build\outputs\apk\app-debug.apk"
             type="MAIN" />

diff --git a/app/build/intermediates/transforms/dex/debug/folders/1000/5/slice_8/classes.dex b/app/build/intermediates/transforms/dex/debug/folders/1000/5/slice_8/classes.dex
diff --git a/...sforms/instantRun/debug/folders/1/5/main/com/example/matt/soundboard/MainActivity$1.class b/...sforms/instantRun/debug/folders/1/5/main/com/example/matt/soundboard/MainActivity$1.class
diff --git a/...ansforms/instantRun/debug/folders/1/5/main/com/example/matt/soundboard/MainActivity.class b/...ansforms/instantRun/debug/folders/1/5/main/com/example/matt/soundboard/MainActivity.class
diff --git a/...ates/transforms/instantRun/debug/folders/1/5/main/com/example/matt/soundboard/Sound.class b/...ates/transforms/instantRun/debug/folders/1/5/main/com/example/matt/soundboard/Sound.class
diff --git a/...stantRunSlicer/debug/folders/1/5/slice_8/com/example/matt/soundboard/MainActivity$1.class b/...stantRunSlicer/debug/folders/1/5/slice_8/com/example/matt/soundboard/MainActivity$1.class
diff --git a/...instantRunSlicer/debug/folders/1/5/slice_8/com/example/matt/soundboard/MainActivity.class b/...instantRunSlicer/debug/folders/1/5/slice_8/com/example/matt/soundboard/MainActivity.class
diff --git a/...sforms/instantRunSlicer/debug/folders/1/5/slice_8/com/example/matt/soundboard/Sound.class b/...sforms/instantRunSlicer/debug/folders/1/5/slice_8/com/example/matt/soundboard/Sound.class
diff --git a/app/build/outputs/apk/app-debug-unaligned.apk b/app/build/outputs/apk/app-debug-unaligned.apk
diff --git a/app/build/outputs/apk/app-debug.apk b/app/build/outputs/apk/app-debug.apk