Song screen view with methods on both pause and play buttons.

.idea/workspace.xml

@@ -14,15 +14,7 @@
     <last-search-timestamp>1558099117772</last-search-timestamp>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="2e150a74-2388-4ba3-8805-625472c5af43" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/dictionaries/charleypunshon.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_playlist_view.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view2.xml" afterDir="false" />
+    <list default="true" id="2e150a74-2388-4ba3-8805-625472c5af43" name="Default Changelist" comment="Song screen view with method added to Play button.">
       <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" afterDir="false" />
@@ -30,20 +22,11 @@
       <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/taskHistory/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/taskHistory/taskHistory.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/taskHistory/taskHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/taskHistory/taskHistory.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/app/out/" />
@@ -77,28 +60,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="42" />
+          <entry key="java" value="45" />
           <entry key="xml" value="27" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="42" />
+          <entry key="JAVA" value="45" />
           <entry key="XML" value="27" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3005" />
-          <entry key="txt" value="470" />
+          <entry key="java" value="3228" />
+          <entry key="txt" value="550" />
           <entry key="xml" value="192" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3005" />
-          <entry key="PLAIN_TEXT" value="470" />
+          <entry key="JAVA" value="3228" />
+          <entry key="PLAIN_TEXT" value="550" />
           <entry key="XML" value="192" />
         </counts>
       </usages-collector>
@@ -109,8 +92,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="213">
-              <caret line="462" column="55" selection-start-line="462" selection-start-column="55" selection-end-line="462" selection-end-column="55" />
+            <state relative-caret-position="355">
+              <caret line="154" column="31" selection-start-line="154" selection-start-column="31" selection-end-line="154" selection-end-column="31" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#701#709#0" expanded="true" />
@@ -128,50 +111,56 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="306">
-              <caret line="34" column="4" selection-start-line="34" selection-start-column="4" selection-end-line="37" selection-end-column="5" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view2.xml">
           <provider editor-type-id="text-editor" />
           <provider selected="true" editor-type-id="android-designer2" />
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml">
           <provider editor-type-id="text-editor" />
           <provider selected="true" editor-type-id="android-designer2" />
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="315">
-              <caret line="23" column="31" selection-start-line="23" selection-start-column="31" selection-end-line="23" selection-end-column="31" />
+            <state relative-caret-position="382">
+              <caret line="71" selection-start-line="71" selection-end-line="71" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="233">
+              <caret line="160" column="99" lean-forward="true" selection-start-line="160" selection-start-column="16" selection-end-line="160" selection-end-column="99" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="106">
-              <caret line="17" column="8" selection-start-line="17" selection-start-column="8" selection-end-line="28" selection-end-column="31" />
+            <state relative-caret-position="318">
+              <caret line="35" column="91" selection-start-line="35" selection-start-column="91" selection-end-line="35" selection-end-column="91" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/BuildPlaylist.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+            <state relative-caret-position="90">
+              <caret line="10" column="49" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="49" />
             </state>
           </provider>
         </entry>
@@ -179,7 +168,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SpotifyClass.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-314">
+            <state relative-caret-position="-533">
               <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
             </state>
           </provider>
@@ -262,12 +251,12 @@
         <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java" />
         <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationScreen.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java" />
         <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view2.xml" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" />
         <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java" />
       </list>
     </option>
   </component>
@@ -545,7 +534,21 @@
       <option name="project" value="LOCAL" />
       <updated>1558279851800</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="Song screen view with Title, tags and button.">
+      <created>1558289721156</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1558289721156</updated>
+    </task>
+    <task id="LOCAL-00006" summary="Song screen view with method added to Play button.">
+      <created>1558289946112</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1558289946112</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TodoView">
@@ -559,10 +562,9 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1440" height="801" extended-state="6" />
-    <editor active="true" />
     <layout>
       <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
-      <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.17310444" />
+      <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.17310444" />
       <window_info id="Structure" order="2" side_tool="true" />
       <window_info id="Favorites" order="3" side_tool="true" />
       <window_info id="Build Variants" order="4" side_tool="true" />
@@ -622,7 +624,9 @@
     <MESSAGE value="Song screen" />
     <MESSAGE value="Progress on Asynchronous Data" />
     <MESSAGE value="Song screen view with button" />
-    <option name="LAST_COMMIT_MESSAGE" value="Song screen view with button" />
+    <MESSAGE value="Song screen view with Title, tags and button." />
+    <MESSAGE value="Song screen view with method added to Play button." />
+    <option name="LAST_COMMIT_MESSAGE" value="Song screen view with method added to Play button." />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/IndividualPlaylist.java" />
@@ -768,16 +772,6 @@
       <provider editor-type-id="text-editor" />
       <provider selected="true" editor-type-id="android-designer2" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/homeScreen.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="65" column="26" selection-start-line="65" selection-start-column="26" selection-end-line="65" selection-end-column="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_home_screen.xml">
       <provider editor-type-id="text-editor" />
       <provider selected="true" editor-type-id="android-designer2" />
@@ -801,16 +795,6 @@
       </provider>
       <provider editor-type-id="android-designer2" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="233">
-          <caret line="160" column="70" selection-start-line="160" selection-start-column="70" selection-end-line="160" selection-end-column="70" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="836">
@@ -868,38 +852,71 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/BuildPlaylist.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="319">
-          <caret line="46" column="76" selection-start-line="46" selection-start-column="76" selection-end-line="46" selection-end-column="76" />
+        <state relative-caret-position="60">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="34" column="4" selection-start-line="34" selection-start-column="4" selection-end-line="37" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/homeScreen.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="70" column="4" selection-start-line="70" selection-start-column="4" selection-end-line="73" selection-end-column="5" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#549#550#0" expanded="true" />
-            <element signature="e#587#588#0" expanded="true" />
-            <element signature="e#1398#1399#0" expanded="true" />
-            <element signature="e#1446#1447#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SpotifyClass.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-314">
+        <state relative-caret-position="-533">
           <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/BuildPlaylist.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        <state relative-caret-position="90">
+          <caret line="10" column="49" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="34" column="4" selection-start-line="34" selection-start-column="4" selection-end-line="37" selection-end-column="5" />
+        <state relative-caret-position="355">
+          <caret line="154" column="31" selection-start-line="154" selection-start-column="31" selection-end-line="154" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#701#709#0" expanded="true" />
+            <element signature="e#769#777#0" expanded="true" />
+            <element signature="e#839#847#0" expanded="true" />
+            <element signature="e#911#919#0" expanded="true" />
+            <element signature="e#982#990#0" expanded="true" />
+            <element signature="e#1053#1061#0" expanded="true" />
+            <element signature="e#1123#1131#0" expanded="true" />
+            <element signature="e#1195#1203#0" expanded="true" />
+            <element signature="e#1264#1272#0" expanded="true" />
+            <element signature="e#1333#1341#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="382">
+          <caret line="71" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -923,43 +940,26 @@
       <provider editor-type-id="text-editor" />
       <provider selected="true" editor-type-id="android-designer2" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="17" column="8" selection-start-line="17" selection-start-column="8" selection-end-line="28" selection-end-column="31" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml">
+      <provider editor-type-id="text-editor" />
+      <provider selected="true" editor-type-id="android-designer2" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="213">
-          <caret line="462" column="55" selection-start-line="462" selection-start-column="55" selection-end-line="462" selection-end-column="55" />
+        <state relative-caret-position="233">
+          <caret line="160" column="99" lean-forward="true" selection-start-line="160" selection-start-column="16" selection-end-line="160" selection-end-column="99" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#701#709#0" expanded="true" />
-            <element signature="e#769#777#0" expanded="true" />
-            <element signature="e#839#847#0" expanded="true" />
-            <element signature="e#911#919#0" expanded="true" />
-            <element signature="e#982#990#0" expanded="true" />
-            <element signature="e#1053#1061#0" expanded="true" />
-            <element signature="e#1123#1131#0" expanded="true" />
-            <element signature="e#1195#1203#0" expanded="true" />
-            <element signature="e#1264#1272#0" expanded="true" />
-            <element signature="e#1333#1341#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="23" column="31" selection-start-line="23" selection-start-column="31" selection-end-line="23" selection-end-column="31" />
+        <state relative-caret-position="318">
+          <caret line="35" column="91" selection-start-line="35" selection-start-column="91" selection-end-line="35" selection-end-column="91" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml">
-      <provider editor-type-id="text-editor" />
-      <provider selected="true" editor-type-id="android-designer2" />
-    </entry>
   </component>
 </project>
\ No newline at end of file

app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java

@@ -4,15 +4,19 @@ import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.TextView;
+import android.widget.Toast;
 
 public class SongInformationPage extends AppCompatActivity {
 
+
+    String title;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_song_information_page);
 
-        String title = getIntent().getStringExtra("song_name");
+        title = getIntent().getStringExtra("song_name");
         String tag1 = getIntent().getStringExtra("tag1_name");
         String tag2 = getIntent().getStringExtra("tag2_name");
         String tag3 = getIntent().getStringExtra("tag3_name");
@@ -27,8 +31,16 @@ public class SongInformationPage extends AppCompatActivity {
     }
 
     public void songPlayOnClick(View view) {
+        String id = getIntent().getStringExtra("id");
+        SpotifyClass spotifyClass = MainActivity.spotifyClass;
+        spotifyClass.pauseSong();
+        spotifyClass.playSong(id);
+        Toast.makeText(SongInformationPage.this,"You are now playing: " + title, Toast.LENGTH_LONG).show();
+    }
+
+    public void songPauseOnClick(View view) {
         SpotifyClass spotifyClass = MainActivity.spotifyClass;
         spotifyClass.pauseSong();
-        spotifyClass.playSong("");
+        Toast.makeText(SongInformationPage.this,"You've now paused the song", Toast.LENGTH_LONG).show();
     }
 }

app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java

@@ -9,6 +9,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 public class ThaiAsyncTask  extends AsyncTask<Void, Void, ArrayAdapter<String>> {
     public ArrayList<String> thaiResults = new ArrayList<>();
@@ -19,6 +20,7 @@ public class ThaiAsyncTask  extends AsyncTask<Void, Void, ArrayAdapter<String>>
     public ArrayList<String> attributesSong5 = new ArrayList<>();
     public ArrayList<String> attributesSong6 = new ArrayList<>();
     public ArrayList<String> attributesSong7 = new ArrayList<>();
+    public ArrayList<String> songNamesList = new ArrayList<>();
     public String[] songNames = new String[7];
     public String test;
     public ListView listView;
@@ -39,6 +41,7 @@ public class ThaiAsyncTask  extends AsyncTask<Void, Void, ArrayAdapter<String>>
             for(int i = 0; i < thaiResults.size(); i++) {
                 songNames[i] = dbi.getSongTitle(thaiResults.get(i));
             }
+            songNamesList = new ArrayList<>(Arrays.asList(songNames));
             attributesSong1 = dbi.getAttributesBySongID(thaiResults.get(0));
             attributesSong2 = dbi.getAttributesBySongID(thaiResults.get(1));
             attributesSong3 = dbi.getAttributesBySongID(thaiResults.get(2));
@@ -47,8 +50,9 @@ public class ThaiAsyncTask  extends AsyncTask<Void, Void, ArrayAdapter<String>>
             attributesSong6 = dbi.getAttributesBySongID(thaiResults.get(5));
             attributesSong7 = dbi.getAttributesBySongID(thaiResults.get(6));
 
+
                 ArrayAdapter thaiAdapter = new ArrayAdapter<String>(
-                    context, android.R.layout.simple_list_item_1, thaiResults
+                    context, android.R.layout.simple_list_item_1, songNamesList
             );
             return thaiAdapter;
         } catch (Exception e) {

app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java

@@ -153,7 +153,6 @@ public class swtViewScreen extends AppCompatActivity {
                 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                     switch (position) {
                         case 0:
-                            Log.d("endmysuffering", thaiAsyncTask.songNames[0]);
                             songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                             break;
                         case 1:

app/src/main/res/layout/activity_song_information_page.xml

@@ -64,7 +64,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="96dp"
         android:onClick="songPlayOnClick"
-        android:text="Button"
+        android:text="Play"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/pauseView"
         app:layout_constraintStart_toStartOf="parent" />
@@ -74,7 +74,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="96dp"
-        android:text="Button"
+        android:onClick="songPauseOnClick"
+        android:text="Pause"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/playView" />