Cleaned up code for the search view.

32259739 · charley.punshon · 188982d7 · 32259739 · 32259739 · 32259739
Commit 32259739 authored May 19, 2019 by charley.punshon
23 changed files
--- a/.gradle/4.10.1/fileHashes/fileHashes.bin
+++ b/.gradle/4.10.1/fileHashes/fileHashes.bin
--- a/.gradle/4.10.1/fileHashes/fileHashes.lock
+++ b/.gradle/4.10.1/fileHashes/fileHashes.lock
--- a/.gradle/4.10.1/javaCompile/classAnalysis.bin
+++ b/.gradle/4.10.1/javaCompile/classAnalysis.bin
--- a/.gradle/4.10.1/javaCompile/javaCompile.lock
+++ b/.gradle/4.10.1/javaCompile/javaCompile.lock
--- a/.gradle/4.10.1/taskHistory/taskHistory.bin
+++ b/.gradle/4.10.1/taskHistory/taskHistory.bin
--- a/.gradle/4.10.1/taskHistory/taskHistory.lock
+++ b/.gradle/4.10.1/taskHistory/taskHistory.lock
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/.idea/caches/build_file_checksums.ser
+++ b/.idea/caches/build_file_checksums.ser
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,6 +14,10 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="2e150a74-2388-4ba3-8805-625472c5af43" name="Default Changelist" comment="As good as working build">
+      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylistView.java" 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/res/layout/activity_saved_playlist_view.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists.xml" afterDir="false" />
      <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" />
@@ -21,12 +25,18 @@
      <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/java/com/example/soulfood_assignment2/SavedPlaylists.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists2.java" 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/Listener.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/Listener.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/playlistView.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.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/homeScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/homeScreen.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_saved_playlists.xml" beforeDir="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" />
    </list>
    <ignored path="$PROJECT_DIR$/out/" />
    <ignored path="$PROJECT_DIR$/app/out/" />
@@ -53,34 +63,36 @@
    <session id="1618975579">
      <usages-collector id="statistics.lifecycle.project">
        <counts>
+          <entry key="project.closed" value="1" />
          <entry key="project.open.time.1" value="1" />
-          <entry key="project.opened" value="1" />
+          <entry key="project.open.time.2" value="1" />
+          <entry key="project.opened" value="2" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.extensions.open">
        <counts>
          <entry key="class" value="1" />
-          <entry key="java" value="57" />
+          <entry key="java" value="89" />
-          <entry key="xml" value="33" />
+          <entry key="xml" value="41" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.types.open">
        <counts>
          <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="57" />
+          <entry key="JAVA" value="89" />
-          <entry key="XML" value="33" />
+          <entry key="XML" value="41" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.extensions.edit">
        <counts>
-          <entry key="java" value="5599" />
+          <entry key="java" value="5803" />
          <entry key="txt" value="661" />
          <entry key="xml" value="193" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.types.edit">
        <counts>
-          <entry key="JAVA" value="5599" />
+          <entry key="JAVA" value="5803" />
          <entry key="PLAIN_TEXT" value="661" />
          <entry key="XML" value="193" />
        </counts>
@@ -89,35 +101,31 @@
  </component>
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
-        <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/settings.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="279">
-              <caret line="116" column="34" selection-start-line="116" selection-start-column="34" selection-end-line="116" selection-end-column="34" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="691">
+            <state relative-caret-position="386">
-              <caret line="92" column="46" selection-start-line="92" selection-start-column="46" selection-end-line="92" selection-end-column="46" />
+              <caret line="78" column="5" selection-start-line="78" selection-start-column="5" selection-end-line="78" selection-end-column="5" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#1130#1270#0" expanded="true" />
+                <element signature="e#1269#1270#0" expanded="true" />
+              </folding>
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists2.xml">
+        <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_settings.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/ThaiAsyncTask.java">
+        <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="139">
+            <state relative-caret-position="261">
-              <caret line="56" selection-start-line="56" selection-end-line="56" />
+              <caret line="75" column="4" selection-start-line="75" selection-start-column="4" selection-end-line="78" selection-end-column="5" />
              <folding>
                <element signature="imports" expanded="true" />
              </folding>
@@ -126,72 +134,69 @@
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists2.java">
+        <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="180">
+            <state relative-caret-position="402">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+              <caret line="115" column="38" selection-start-line="115" selection-start-column="38" selection-end-line="115" selection-end-column="38" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="114">
+            <state relative-caret-position="211">
-              <caret line="45" selection-start-line="45" selection-end-line="45" />
+              <caret line="81" column="45" lean-forward="true" selection-start-line="81" selection-start-column="45" selection-end-line="81" selection-end-column="45" />
-              <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/res/layout/build_playlist.xml">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java">
-          <provider editor-type-id="text-editor" />
+          <provider selected="true" editor-type-id="text-editor">
-          <provider selected="true" editor-type-id="android-designer2" />
+            <state relative-caret-position="-71">
+              <caret line="9" column="30" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" />
+            </state>
+          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java">
-          <provider editor-type-id="text-editor">
+          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
+            <state relative-caret-position="-91">
-              <caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
+              <caret line="10" column="49" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="49" />
            </state>
          </provider>
-          <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/java/com/example/soulfood_assignment2/swtViewScreen.java">
+        <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="129">
+            <state relative-caret-position="-31">
-              <caret line="173" column="100" selection-start-line="173" selection-start-column="100" selection-end-line="173" selection-end-column="100" />
+              <caret line="22" column="7" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncTask.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="195">
+              <caret line="13" selection-start-line="13" selection-end-line="13" />
              <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>
      </file>
      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_playlist_view.xml">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java">
-          <provider editor-type-id="text-editor">
+          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
+            <state relative-caret-position="-179">
-              <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
+              <caret line="24" selection-start-line="24" selection-end-line="24" />
            </state>
          </provider>
-          <provider selected="true" editor-type-id="android-designer2" />
        </entry>
      </file>
    </leaf>
@@ -234,7 +239,6 @@
        <option value="$PROJECT_DIR$/build.gradle" />
        <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
        <option value="$PROJECT_DIR$/app/build.gradle" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/homeScreen.java" />
        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncImpl.java" />
        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AsyncTask.java" />
        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncTask.java" />
@@ -243,25 +247,29 @@
        <option value="$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml" />
        <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml" />
        <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_with_tag_view.xml" />
-        <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java" />
-        <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/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/SongInformationPage.java" />
        <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml" />
-        <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java" />
        <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_playlist_view.xml" />
        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.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/SavedPlaylists.java" />
        <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists.xml" />
        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists2.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/Listener.java" />
+        <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlist_view.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylistView.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/homeScreen.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/searchScreen.java" />
        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" />
+        <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java" />
      </list>
    </option>
  </component>
@@ -275,9 +283,6 @@
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
-      <pane id="ProjectPane" />
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
      <pane id="Scope">
        <subPane subId="Scope 'Project Files'; set:Project Files; class com.intellij.psi.search.scope.ProjectFilesScope">
          <expand>
@@ -393,6 +398,9 @@
          <select />
        </subPane>
      </pane>
+      <pane id="PackagesPane" />
+      <pane id="ProjectPane" />
+      <pane id="AndroidView" />
    </panes>
  </component>
  <component name="PropertiesComponent">
@@ -420,8 +428,8 @@
      <recent name="com.example.soulfood_assignment2" />
    </key>
    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/app/src/main/res/layout" />
      <recent name="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2" />
+      <recent name="$PROJECT_DIR$/app/src/main/res/layout" />
    </key>
    <key name="android.template.parentActivityClass">
      <recent name="" />
@@ -580,8 +588,7 @@
    </todo-panel>
  </component>
  <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1440" height="801" extended-state="6" />
+    <frame x="0" y="23" width="1440" height="801" extended-state="0" />
-    <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" />
@@ -593,12 +600,12 @@
      <window_info id="Resources Explorer" order="7" />
      <window_info id="Capture Tool" order="8" />
      <window_info anchor="bottom" id="Run" order="0" sideWeight="0.49959838" weight="0.32863188" />
-      <window_info anchor="bottom" id="Logcat" order="1" sideWeight="0.49959838" weight="0.34273624" />
+      <window_info anchor="bottom" id="Logcat" order="1" sideWeight="0.49959838" visible="true" weight="0.34273624" />
      <window_info anchor="bottom" id="TODO" order="2" sideWeight="0.49959838" weight="0.32796487" />
      <window_info anchor="bottom" id="Debug" order="3" />
-      <window_info anchor="bottom" id="Terminal" order="4" visible="true" weight="0.32722145" />
+      <window_info anchor="bottom" id="Terminal" order="4" weight="0.32722145" />
      <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50067115" side_tool="true" weight="0.3133236" />
-      <window_info anchor="bottom" id="Version Control" order="6" sideWeight="0.49959838" weight="0.32796487" />
+      <window_info anchor="bottom" id="Version Control" order="6" sideWeight="0.49959838" weight="0.32722145" />
      <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49932885" weight="0.31593794" />
      <window_info anchor="bottom" id="Find" order="8" weight="0.32863188" />
      <window_info anchor="bottom" id="Android Profiler" order="9" />
@@ -651,10 +658,6 @@
    <option name="LAST_COMMIT_MESSAGE" value="Half working build playlist feature." />
  </component>
  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_individual_playlist.xml" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_individual_playlist.xml" />
-    <entry file="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/spotify-app-remote-release-0.6.1.aar/c6916b27e6bb07c1ecebea46c4dc5fc0/jars/classes.jar!/com/spotify/android/appremote/internal/RemoteServiceIo.class" />
-    <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/java/lang/Thread.java" />
    <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/java/util/concurrent/ThreadPoolExecutor.java" />
    <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
      <provider selected="true" editor-type-id="text-editor">
@@ -692,13 +695,7 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncImpl.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncImpl.java" />
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/FrenchAsyncTask.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="60">
@@ -706,16 +703,7 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AsyncTask.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AsyncTask.java" />
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="18" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/HappyAsyncTask.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="60">
@@ -723,16 +711,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncTask.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="19" column="1" selection-start-line="19" selection-start-column="1" selection-end-line="19" selection-end-column="1" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChillAsyncTask.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="225">
@@ -783,213 +761,222 @@
      <provider editor-type-id="text-editor" />
      <provider selected="true" editor-type-id="android-designer2" />
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_home_screen.xml">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml" />
-      <provider editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationScreen.java" />
-      <provider selected="true" editor-type-id="android-designer2" />
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_song_screen_view.xml" />
+    <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="-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/res/layout/activity_main.xml">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_with_tag_view.xml">
-      <provider editor-type-id="text-editor" />
+      <provider editor-type-id="text-editor">
+        <state relative-caret-position="735">
+          <caret line="49" column="15" selection-start-line="49" selection-start-column="15" selection-end-line="49" selection-end-column="15" />
+        </state>
+      </provider>
      <provider selected="true" editor-type-id="android-designer2" />
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml">
+    <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>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationScreen.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="32" selection-start-line="10" selection-start-column="32" selection-end-line="10" selection-end-column="32" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_song_screen_view.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/homeScreen.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/databaseInterface.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
+        <state relative-caret-position="1840">
-          <caret line="70" column="4" selection-start-line="70" selection-start-column="4" selection-end-line="73" selection-end-column="5" />
+          <caret line="141" column="61" selection-start-line="141" selection-start-column="29" selection-end-line="141" selection-end-column="61" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SpotifyClass.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="-533">
+        <state relative-caret-position="60">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+          <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/SongScreenView.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml">
-      <provider selected="true" editor-type-id="text-editor">
+      <provider editor-type-id="text-editor" />
-        <state relative-caret-position="90">
+      <provider selected="true" editor-type-id="android-designer2" />
-          <caret line="10" column="49" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="49" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml">
+      <provider editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
        </state>
      </provider>
+      <provider selected="true" editor-type-id="android-designer2" />
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_with_tag_view.xml">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_playlist_view.xml">
      <provider editor-type-id="text-editor">
-        <state relative-caret-position="735">
+        <state relative-caret-position="285">
-          <caret line="49" column="15" selection-start-line="49" selection-start-column="15" selection-end-line="49" selection-end-column="15" />
+          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
        </state>
      </provider>
      <provider selected="true" editor-type-id="android-designer2" />
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view2.xml">
+    <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" />
    </entry>
-    <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/Listener.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="363">
+        <state relative-caret-position="165">
-          <caret line="43" column="75" selection-start-line="43" selection-start-column="75" selection-end-line="43" selection-end-column="75" />
+          <caret line="14" column="63" selection-start-line="14" selection-start-column="63" selection-end-line="14" selection-end-column="63" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
      <provider editor-type-id="text-editor" />
      <provider selected="true" editor-type-id="android-designer2" />
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlist_view.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/settings.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists2.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/SavedPlaylistView.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="262">
+        <state relative-caret-position="60">
-          <caret line="39" column="13" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" />
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AsyncronousTask.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="15" column="31" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
+        </state>
+      </provider>
+      <provider editor-type-id="android-designer2" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="60">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/databaseInterface.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists2.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1840">
+        <state relative-caret-position="180">
-          <caret line="141" column="61" selection-start-line="141" selection-start-column="29" selection-end-line="141" selection-end-column="61" />
+          <caret line="13" selection-start-line="13" selection-end-line="13" />
+        </state>
+      </provider>
+    </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="-1399">
+          <caret line="45" selection-start-line="45" selection-end-line="45" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AsyncronousTask.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="107">
+        <state relative-caret-position="60">
-          <caret line="133" column="4" selection-start-line="133" selection-start-column="4" selection-end-line="140" selection-end-column="5" />
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" 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/ThaiAsyncTask.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
+        <state relative-caret-position="166">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+          <caret line="23" column="45" selection-start-line="23" selection-start-column="45" selection-end-line="23" selection-end-column="45" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
        </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/ChineseAsyncTask.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
+        <state relative-caret-position="195">
-          <caret line="116" column="34" selection-start-line="116" selection-start-column="34" selection-end-line="116" selection-end-column="34" />
+          <caret line="13" selection-start-line="13" selection-end-line="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_playlist_view.xml">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java">
-      <provider editor-type-id="text-editor">
+      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
+        <state relative-caret-position="-179">
-          <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
+          <caret line="24" selection-start-line="24" selection-end-line="24" />
        </state>
      </provider>
-      <provider selected="true" editor-type-id="android-designer2" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml">
-      <provider editor-type-id="text-editor" />
-      <provider selected="true" editor-type-id="android-designer2" />
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java">
-      <provider editor-type-id="text-editor">
+      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
+        <state relative-caret-position="-71">
-          <caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
+          <caret line="9" column="30" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" />
        </state>
      </provider>
-      <provider selected="true" editor-type-id="android-designer2" />
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.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="114">
+        <state relative-caret-position="-91">
-          <caret line="45" selection-start-line="45" selection-end-line="45" />
+          <caret line="10" column="49" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="49" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
        </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/SongInformationPage.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="139">
+        <state relative-caret-position="-31">
-          <caret line="56" selection-start-line="56" selection-end-line="56" />
+          <caret line="22" column="7" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists.xml">
+    <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="225">
+        <state relative-caret-position="402">
-          <caret line="15" column="31" lean-forward="true" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
+          <caret line="115" column="38" selection-start-line="115" selection-start-column="38" selection-end-line="115" selection-end-column="38" />
        </state>
      </provider>
-      <provider editor-type-id="android-designer2" />
    </entry>
    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="691">
+        <state relative-caret-position="211">
-          <caret line="92" column="46" selection-start-line="92" selection-start-column="46" selection-end-line="92" selection-end-column="46" />
+          <caret line="81" column="45" lean-forward="true" selection-start-line="81" selection-start-column="45" selection-end-line="81" selection-end-column="45" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists2.xml">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_settings.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/SavedPlaylists2.java">
+    <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="180">
+        <state relative-caret-position="261">
-          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+          <caret line="75" column="4" selection-start-line="75" selection-start-column="4" selection-end-line="78" selection-end-column="5" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
        </state>
      </provider>
    </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/settings.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
+        <state relative-caret-position="386">
-          <caret line="173" column="100" selection-start-line="173" selection-start-column="100" selection-end-line="173" selection-end-column="100" />
+          <caret line="78" column="5" selection-start-line="78" selection-start-column="5" selection-end-line="78" selection-end-column="5" />
          <folding>
            <element signature="imports" expanded="true" />
-            <element signature="e#701#709#0" expanded="true" />
+            <element signature="e#1130#1270#0" expanded="true" />
-            <element signature="e#769#777#0" expanded="true" />
+            <element signature="e#1269#1270#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>

--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,8 @@
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:theme="@style/AppTheme">
-        <activity android:name=".SongInformationPage"></activity>
+        <activity android:name=".SavedPlaylistView"></activity>
+        <activity android:name=".SongInformationPage" />
        <activity android:name=".SongScreenView" />
        <activity android:name=".playlistView" />
        <activity android:name=".SavedPlaylists" />

--- a/app/src/main/java/com/example/soulfood_assignment2/Listener.java
+++ b/app/src/main/java/com/example/soulfood_assignment2/Listener.java
@@ -12,7 +12,7 @@ public class Listener implements View.OnClickListener  {
        Log.d("Testing", "Button pressed");
-        Intent i = new Intent(v.getContext(), SavedPlaylists.class);
+        Intent i = new Intent(v.getContext(), SavedPlaylistView.class);
        v.getContext().startActivity(i);
    }
 }
--- a/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylistView.java
+++ b/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylistView.java
+package com.example.soulfood_assignment2;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+public class SavedPlaylistView extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_saved_playlists);
+    }
+}
--- a/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.java
+++ b/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.java
+package com.example.soulfood_assignment2;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import java.util.ArrayList;
+public class SavedPlaylists extends AppCompatActivity {
+    public static SharedPreferences playlists;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_saved_playlists);
+        playlists = getPreferences(Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = playlists.edit();
+        editor.putString("playlist 1", "1");
+        editor.commit();
+        ArrayList<String> saved = new ArrayList<>();
+        saved.add("Playlist " + playlists.getString("playlist 1", "0"));
+        saved.add("Playlist " + playlists.getString("playlist 2", "0"));
+        saved.add("Playlist " + playlists.getString("playlist 3", "0"));
+        for (String s: saved) {
+            if(s.equals("Playlist 0")) {
+                saved.remove(s);
+            }
+        }
+        ListView listView = findViewById(R.id.listViewPlaylists);
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, saved);
+        listView.setAdapter(adapter);
+    }
+}
--- a/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java
+++ b/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java
@@ -21,7 +21,7 @@ public class ThaiAsyncTask  extends AsyncTask<Void, Void, ArrayAdapter<String>>
    public ArrayList<String> attributesSong6 = new ArrayList<>();
    public ArrayList<String> attributesSong7 = new ArrayList<>();
    public ArrayList<String> songNamesList = new ArrayList<>();
-    public String[] songNames = new String[20];
+    public String[] songNames = new String[8];
    public ListView listView;
    public Context context;
    public databaseInterface.Cuisine cuisine;

--- a/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java
+++ b/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java
@@ -114,7 +114,6 @@ public class build_playlist extends AppCompatActivity {
    public void buildPlaylistOnClick(View view) {
        Intent intent = new Intent(this, playlistView.class);
        intent.putExtra("vibe", vibe);
-        Log.d("VibeBitch!", vibe);
        intent.putExtra("cuisine", cuisine);
        intent.putExtra("timeofday", timeOfDay);
        startActivity(intent);

--- a/app/src/main/java/com/example/soulfood_assignment2/homeScreen.java
+++ b/app/src/main/java/com/example/soulfood_assignment2/homeScreen.java
@@ -72,4 +72,9 @@ public class homeScreen extends AppCompatActivity {
        Intent intent = new Intent(this, settings.class);
        startActivity(intent);
    }
+    public void savedViewOnClick(View view) {
+        Intent intent = new Intent(this, SavedPlaylists.class);
+        startActivity(intent);
+    }
 }
--- a/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java
+++ b/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java
@@ -23,20 +23,6 @@ public class searchScreen extends AppCompatActivity {
    public ListView songResults;
    public ArrayAdapter<String> adapter;
-    public ArrayList<String> chineseResults;
-    public ArrayList<String> thaiResults;
-    public ArrayList<String> indianResults;
-    public ArrayList<String> japaneseResults;
-    public ArrayList<String> italianResults;
-    public ArrayList<String> mexicanResults;
-    public ArrayList<String> frenchResults;
-    public ArrayList<String> americanResults;
-    public ArrayList<String> chillResults;
-    public ArrayList<String> happyResults;
-    public ArrayList<String> energeticResults;
    public Intent vibeView;
    @Override
@@ -60,68 +46,38 @@ public class searchScreen extends AppCompatActivity {
            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                switch (position) {
                    case 0:
-                        ChineseAsyncTask chineseAsyncTask = new ChineseAsyncTask();
+                        tagNamePage("Chinese");
-                        chineseAsyncTask.execute();
-                        chineseResults = chineseAsyncTask.chineseResults;
-                        tagNamePage("Chinese", chineseResults);
                        break;
                    case 1:
-                        tagNamePage("Thai", thaiResults);
+                        tagNamePage("Thai");
                        break;
                    case 2:
-                        IndianAsyncTask indianAsyncTask = new IndianAsyncTask();
+                        tagNamePage("Indian");
-                        indianAsyncTask.execute();
-                        indianResults = indianAsyncTask.indianResults;
-                        tagNamePage("Indian", indianResults);
                        break;
                    case 3:
-                        JapaneseAsyncTask japaneseAsyncTask = new JapaneseAsyncTask();
+                        tagNamePage("Japanese");
-                        japaneseAsyncTask.execute();
-                        japaneseResults = japaneseAsyncTask.japaneseResults;
-                        tagNamePage("Japanese", japaneseResults);
                        break;
                    case 4:
-                        ItalianAsyncTask italianAsyncTask = new ItalianAsyncTask();
+                        tagNamePage("Italian");
-                        italianAsyncTask.execute();
-                        italianResults = italianAsyncTask.italianResults;
-                        tagNamePage("Italian", italianResults);
                        break;
                    case 5:
-                        MexicanAsyncTask mexicanAsyncTask = new MexicanAsyncTask();
+                        tagNamePage("Mexican");
-                        mexicanAsyncTask.execute();
-                        mexicanResults = mexicanAsyncTask.mexicanResults;
-                        tagNamePage("Mexican", mexicanResults);
                        break;
                    case 6:
-                        FrenchAsyncTask frenchAsyncTask = new FrenchAsyncTask();
+                        tagNamePage("French");
-                        frenchAsyncTask.execute();
-                        frenchResults = frenchAsyncTask.frenchResults;
-                        tagNamePage("French", frenchResults);
                        break;
                    case 7:
-                        AmericanAsyncTask americanAsyncTask = new AmericanAsyncTask();
+                        tagNamePage("American");
-                        americanAsyncTask.execute();
-                        americanResults = americanAsyncTask.americanResults;
-                        tagNamePage("American", americanResults);
                        break;
                    case 8:
-                        ChillAsyncTask chillAsyncTask = new ChillAsyncTask();
+                       // tagNamePage("Chill");
-                        chillAsyncTask.execute();
+                        // break;
-                        chillResults = chillAsyncTask.chillResults;
-                        tagNamePage("Chill", chillResults);
-                        break;
                    case 9:
-                        HappyAsyncTask happyAsyncTask = new HappyAsyncTask();
+                        //tagNamePage("Happy");
-                        happyAsyncTask.execute();
+                        //break;
-                        happyResults = happyAsyncTask.happyResults;
-                        tagNamePage("Happy", happyResults);
-                        break;
                    case 10:
-                        EnergeticAsyncTask energeticAsyncTask = new EnergeticAsyncTask();
+                        //tagNamePage("energetic");
-                        energeticAsyncTask.execute();
+                        //break;
-                        energeticResults = energeticAsyncTask.energeticResults;
-                        tagNamePage("energetic", energeticResults);
-                        break;
                }
            }
@@ -131,12 +87,11 @@ public class searchScreen extends AppCompatActivity {
    }
-    public void tagNamePage(String tagNameMethod, ArrayList<String> results) {
+    public void tagNamePage(String tagNameMethod) {
        String tagView = "Songs with '" + tagNameMethod +"' Tag";
        vibeView = new Intent(searchScreen.this, swtViewScreen.class);
        vibeView.putExtra("tag_name", tagView);
        vibeView.putExtra("tag_name_selected", tagNameMethod);
-        vibeView.putExtra("array_list",results);
        startActivity(vibeView);
    }

--- a/app/src/main/java/com/example/soulfood_assignment2/settings.java
+++ b/app/src/main/java/com/example/soulfood_assignment2/settings.java
@@ -2,6 +2,7 @@ package com.example.soulfood_assignment2;
 import android.R.layout;
 import android.content.Context;
+import android.content.Intent;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.provider.MediaStore;
@@ -71,4 +72,9 @@ public class settings extends AppCompatActivity {
            e.printStackTrace();
        }
    }
+    public void homeScreenViewOnClick(View view) {
+        Intent intent = new Intent(this, homeScreen.class);
+        startActivity(intent);
+    }
 }
--- a/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java
+++ b/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java
@@ -2,57 +2,18 @@ package com.example.soulfood_assignment2;
 import android.annotation.SuppressLint;
 import android.content.Intent;
-import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
-import com.spotify.android.appremote.api.SpotifyAppRemote;
-import java.util.ArrayList;
-import java.util.Arrays;
 public class swtViewScreen extends AppCompatActivity {
    public ListView tagResults;
    public Intent songView;
-    public ArrayList<String> chineseResults = new ArrayList<String>();
-    public ArrayList<String> thaiResults = new ArrayList<String>();
-    public ArrayList<String> indianResults = new ArrayList<String>();
-    public ArrayList<String> japaneseResults = new ArrayList<String>();
-    public ArrayList<String> italianResults = new ArrayList<String>();
-    public ArrayList<String> mexicanResults = new ArrayList<String>();
-    public ArrayList<String> frenchResults = new ArrayList<String>();
-    public ArrayList<String> americanResults = new ArrayList<String>();
-    public ArrayList<String> chillResults = new ArrayList<String>();
-    public ArrayList<String> happyResults = new ArrayList<String>();
-    public ArrayAdapter<String> chineseAdapter;
-    public ArrayAdapter<String> indianAdapter;
-    public ArrayAdapter<String> japaneseAdapter;
-    public ArrayAdapter<String> italianAdapter;
-    public ArrayAdapter<String> mexicanAdapter;
-    public ArrayAdapter<String> frenchAdapter;
-    public ArrayAdapter<String> americanAdapter;
-    public ArrayAdapter<String> chillAdapter;
-    public ArrayAdapter<String> happyAdapter;
-    public ArrayAdapter<String> energeticAdapter;
    TextView tagNameView;
-    databaseInterface di;
-    public MainActivity ma = new MainActivity();
    @SuppressLint("StaticFieldLeak")
@@ -61,81 +22,41 @@ public class swtViewScreen extends AppCompatActivity {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_song_with_tag_view);
        String title = getIntent().getStringExtra("tag_name");
-        final ArrayList<String> testArray = getIntent().getStringArrayListExtra("results_array");
        tagNameView = findViewById(R.id.tagTextView2);
        tagNameView.setText(title);
-        chineseResults.addAll(Arrays.asList(getResources().getStringArray(R.array.chineseSearchResultsArray)));
-        indianResults.addAll(Arrays.asList(getResources().getStringArray(R.array.indianSearchResultsArray)));
-        japaneseResults.addAll(Arrays.asList(getResources().getStringArray(R.array.japaneseSearchResultsArray)));
-        italianResults.addAll(Arrays.asList(getResources().getStringArray(R.array.italianSearchResultsArray)));
-        mexicanResults.addAll(Arrays.asList(getResources().getStringArray(R.array.mexicanSearchResultsArray)));
-        frenchResults.addAll(Arrays.asList(getResources().getStringArray(R.array.frenchSearchResultsArray)));
-        americanResults.addAll(Arrays.asList(getResources().getStringArray(R.array.americanSearchResultsArray)));
-        chillResults.addAll(Arrays.asList(getResources().getStringArray(R.array.chilledSearchResultsArray)));
-        happyResults.addAll(Arrays.asList(getResources().getStringArray(R.array.happySearchResultsArray)));
-        chineseAdapter = new ArrayAdapter<String>(
-                this, android.R.layout.simple_list_item_1, chineseResults
-        );
-        indianAdapter = new ArrayAdapter<String>(
-                this, android.R.layout.simple_list_item_1, indianResults
-        );
-        japaneseAdapter = new ArrayAdapter<String>(
-                this, android.R.layout.simple_list_item_1, japaneseResults
-        );
-        italianAdapter = new ArrayAdapter<String>(
-                this, android.R.layout.simple_list_item_1, italianResults
-        );
-        mexicanAdapter = new ArrayAdapter<String>(
-                this, android.R.layout.simple_list_item_1, mexicanResults
-        );
-        frenchAdapter = new ArrayAdapter<String>(
-                this, android.R.layout.simple_list_item_1, frenchResults
-        );
-        americanAdapter = new ArrayAdapter<String>(
-                this, android.R.layout.simple_list_item_1, americanResults
-        );
-        chillAdapter = new ArrayAdapter<String>(
-                this, android.R.layout.simple_list_item_1, chillResults
-        );
-        happyAdapter = new ArrayAdapter<String>(
-                this, android.R.layout.simple_list_item_1, happyResults
-        );
-       //tagResults = findViewById(R.id.charleyNeedsHelp);
        if (tagNameView.getText().toString().equals("Songs with 'Chinese' Tag")) {
-            tagResults.setAdapter(chineseAdapter);
+            ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(swtViewScreen.this, databaseInterface.Cuisine.chinese, databaseInterface.Time.any, databaseInterface.Vibe.any);
+            thaiAsyncTask.listView = findViewById(R.id.charleyNeedsHelp);
+            thaiAsyncTask.execute();
+            tagResults = thaiAsyncTask.listView;
            tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                @Override
                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                    switch (position) {
                        case 0:
-                            //songPage(chineseResults.get(0));
+                            songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 1:
-                            //songPage(chineseResults.get(1));
+                            songPage(thaiAsyncTask.songNames[1], thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 2:
-                            //songPage(chineseResults.get(2));
+                            songPage(thaiAsyncTask.songNames[2], thaiAsyncTask.attributesSong1.get(2), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 3:
-                            //songPage(chineseResults.get(3));
+                            songPage(thaiAsyncTask.songNames[3], thaiAsyncTask.attributesSong1.get(3), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 4:
-                            //songPage(chineseResults.get(4));
+                            songPage(thaiAsyncTask.songNames[4], thaiAsyncTask.attributesSong1.get(4), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 5:
-                            //songPage(chineseResults.get(5));
+                            songPage(thaiAsyncTask.songNames[5], thaiAsyncTask.attributesSong1.get(5), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 6:
-                            //songPage(chineseResults.get(6));
+                            songPage(thaiAsyncTask.songNames[6], thaiAsyncTask.attributesSong1.get(6), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                    }
                }
@@ -147,7 +68,6 @@ public class swtViewScreen extends AppCompatActivity {
            thaiAsyncTask.execute();
            tagResults = thaiAsyncTask.listView;
            tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                @Override
                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -177,285 +97,206 @@ public class swtViewScreen extends AppCompatActivity {
                }
            });
        } else if (tagNameView.getText().toString().equals("Songs with 'Indian' Tag")) {
-            tagResults.setAdapter(indianAdapter);
+            ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(swtViewScreen.this, databaseInterface.Cuisine.indian, databaseInterface.Time.any, databaseInterface.Vibe.any);
+            thaiAsyncTask.listView = findViewById(R.id.charleyNeedsHelp);
+            thaiAsyncTask.execute();
+            tagResults = thaiAsyncTask.listView;
            tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                @Override
                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                    switch (position) {
                        case 0:
-                            MediaPlayer mp = MediaPlayer.create(swtViewScreen.this, R.raw.beepsoundeffect);
+                            songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
-                            mp.start();
-                            //spotify api player
                            break;
                        case 1:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[1], thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 2:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[2], thaiAsyncTask.attributesSong1.get(2), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 3:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[3], thaiAsyncTask.attributesSong1.get(3), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 4:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[4], thaiAsyncTask.attributesSong1.get(4), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 5:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[5], thaiAsyncTask.attributesSong1.get(5), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 6:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[6], thaiAsyncTask.attributesSong1.get(6), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                    }
                }
            });
        } else if (tagNameView.getText().toString().equals("Songs with 'Japanese' Tag")) {
-            tagResults.setAdapter(japaneseAdapter);
+            ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(swtViewScreen.this, databaseInterface.Cuisine.japanese, databaseInterface.Time.any, databaseInterface.Vibe.any);
+            thaiAsyncTask.listView = findViewById(R.id.charleyNeedsHelp);
+            thaiAsyncTask.execute();
+            tagResults = thaiAsyncTask.listView;
            tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                @Override
                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                    switch (position) {
                        case 0:
-                            MediaPlayer mp = MediaPlayer.create(swtViewScreen.this, R.raw.beepsoundeffect);
+                            songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
-                            mp.start();
-                            //spotify api player
                            break;
                        case 1:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[1], thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 2:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[2], thaiAsyncTask.attributesSong1.get(2), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 3:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[3], thaiAsyncTask.attributesSong1.get(3), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 4:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[4], thaiAsyncTask.attributesSong1.get(4), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 5:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[5], thaiAsyncTask.attributesSong1.get(5), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 6:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[6], thaiAsyncTask.attributesSong1.get(6), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                    }
                }
            });
        } else if (tagNameView.getText().toString().equals("Songs with 'Italian' Tag")) {
-            tagResults.setAdapter(italianAdapter);
+            ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(swtViewScreen.this, databaseInterface.Cuisine.italian, databaseInterface.Time.any, databaseInterface.Vibe.any);
+            thaiAsyncTask.listView = findViewById(R.id.charleyNeedsHelp);
+            thaiAsyncTask.execute();
+            tagResults = thaiAsyncTask.listView;
            tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                @Override
                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                    switch (position) {
                        case 0:
-                            MediaPlayer mp = MediaPlayer.create(swtViewScreen.this, R.raw.beepsoundeffect);
+                            songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
-                            mp.start();
-                            //spotify api player
                            break;
                        case 1:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[1], thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 2:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[2], thaiAsyncTask.attributesSong1.get(2), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 3:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[3], thaiAsyncTask.attributesSong1.get(3), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 4:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[4], thaiAsyncTask.attributesSong1.get(4), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 5:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[5], thaiAsyncTask.attributesSong1.get(5), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 6:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[6], thaiAsyncTask.attributesSong1.get(6), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                    }
                }
            });
        } else if (tagNameView.getText().toString().equals("Songs with 'Mexican' Tag")) {
-            tagResults.setAdapter(mexicanAdapter);
+            ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(swtViewScreen.this, databaseInterface.Cuisine.mexican, databaseInterface.Time.any, databaseInterface.Vibe.any);
+            thaiAsyncTask.listView = findViewById(R.id.charleyNeedsHelp);
+            thaiAsyncTask.execute();
+            tagResults = thaiAsyncTask.listView;
            tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                @Override
                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                    switch (position) {
                        case 0:
-                            MediaPlayer mp = MediaPlayer.create(swtViewScreen.this, R.raw.beepsoundeffect);
+                            songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
-                            mp.start();
-                            //spotify api player
                            break;
                        case 1:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[1], thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 2:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[2], thaiAsyncTask.attributesSong1.get(2), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 3:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[3], thaiAsyncTask.attributesSong1.get(3), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 4:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[4], thaiAsyncTask.attributesSong1.get(4), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 5:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[5], thaiAsyncTask.attributesSong1.get(5), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 6:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[6], thaiAsyncTask.attributesSong1.get(6), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                    }
                }
            });
        } else if (tagNameView.getText().toString().equals("Songs with 'French' Tag")) {
-            tagResults.setAdapter(frenchAdapter);
+            ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(swtViewScreen.this, databaseInterface.Cuisine.french, databaseInterface.Time.any, databaseInterface.Vibe.any);
+            thaiAsyncTask.listView = findViewById(R.id.charleyNeedsHelp);
+            thaiAsyncTask.execute();
+            tagResults = thaiAsyncTask.listView;
            tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                @Override
                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                    switch (position) {
                        case 0:
-                            MediaPlayer mp = MediaPlayer.create(swtViewScreen.this, R.raw.beepsoundeffect);
+                            songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
-                            mp.start();
-                            //spotify api player
                            break;
                        case 1:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[1], thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 2:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[2], thaiAsyncTask.attributesSong1.get(2), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 3:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[3], thaiAsyncTask.attributesSong1.get(3), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 4:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[4], thaiAsyncTask.attributesSong1.get(4), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 5:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[5], thaiAsyncTask.attributesSong1.get(5), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 6:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[6], thaiAsyncTask.attributesSong1.get(6), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                    }
                }
            });
        } else if (tagNameView.getText().toString().equals("Songs with 'American' Tag")) {
-            tagResults.setAdapter(americanAdapter);
+            ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(swtViewScreen.this, databaseInterface.Cuisine.american, databaseInterface.Time.any, databaseInterface.Vibe.any);
-            tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            thaiAsyncTask.listView = findViewById(R.id.charleyNeedsHelp);
-                @Override
+            thaiAsyncTask.execute();
-                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+            tagResults = thaiAsyncTask.listView;
-                    switch (position) {
-                        case 0:
-                            MediaPlayer mp = MediaPlayer.create(swtViewScreen.this, R.raw.beepsoundeffect);
-                            mp.start();
-                            //spotify api player
-                            break;
-                        case 1:
-                            //spotify api player
-                            break;
-                        case 2:
-                            //spotify api player
-                            break;
-                        case 3:
-                            //spotify api player
-                            break;
-                        case 4:
-                            //spotify api player
-                            break;
-                        case 5:
-                            //spotify api player
-                            break;
-                        case 6:
-                            //spotify api player
-                            break;
-                    }
-                }
-            });
-        } else if (tagNameView.getText().toString().equals("Songs with 'Chill' Tag")) {
-            tagResults.setAdapter(chillAdapter);
-            tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-                @Override
-                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                    switch (position) {
-                        case 0:
-                            MediaPlayer mp = MediaPlayer.create(swtViewScreen.this, R.raw.beepsoundeffect);
-                            mp.start();
-                            //spotify api player
-                            break;
-                        case 1:
-                            //spotify api player
-                            break;
-                        case 2:
-                            //spotify api player
-                            break;
-                        case 3:
-                            //spotify api player
-                            break;
-                        case 4:
-                            //spotify api player
-                            break;
-                        case 5:
-                            //spotify api player
-                            break;
-                        case 6:
-                            //spotify api player
-                            break;
-                        case 7:
-                            //spotify api player
-                            break;
-                        case 8:
-                            //spotify api player
-                            break;
-                        case 9:
-                            //spotify api player
-                            break;
-                        case 10:
-                            //spotify api player
-                            break;
-                    }
-                }
-            });
-        } else if (tagNameView.getText().toString().equals("Songs with 'Happy' Tag")) {
-            tagResults.setAdapter(happyAdapter);
            tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                @Override
                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                    switch (position) {
                        case 0:
-                            MediaPlayer mp = MediaPlayer.create(swtViewScreen.this, R.raw.beepsoundeffect);
+                            songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
-                            mp.start();
-                            //spotify api player
                            break;
                        case 1:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[1], thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 2:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[2], thaiAsyncTask.attributesSong1.get(2), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 3:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[3], thaiAsyncTask.attributesSong1.get(3), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 4:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[4], thaiAsyncTask.attributesSong1.get(4), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 5:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[5], thaiAsyncTask.attributesSong1.get(5), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
                            break;
                        case 6:
-                            //spotify api player
+                            songPage(thaiAsyncTask.songNames[6], thaiAsyncTask.attributesSong1.get(6), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
-                            break;
-                        case 7:
-                            //spotify api player
-                            break;
-                        case 8:
-                            //spotify api player
-                            break;
-                        case 9:
-                            //spotify api player
                            break;
                    }
                }
            });
        }
    }
    public void songPage(String songName, String tag1, String tag2, String tag3) {

--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -50,7 +50,7 @@
        android:layout_marginEnd="8dp"
        android:layout_marginRight="8dp"
        android:layout_marginBottom="100dp"
-        android:onClick="savedPlaylistViewOnClick"
+        android:onClick="savedViewOnClick"
        android:text="SAVED PLAYLISTS"
        android:textColor="#000000"
        android:textSize="24sp"

--- a/app/src/main/res/layout/activity_saved_playlist_view.xml
+++ b/app/src/main/res/layout/activity_saved_playlist_view.xml
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.example.soulfood_assignment2.SavedPlaylistView">
+    <ListView
+        android:id="@+id/savedPlaylists"
+        android:layout_width="wrap_content"
+        android:layout_height="500dp"
+        android:layout_marginTop="76dp"
+        android:layout_marginBottom="77dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView9"></ListView>
+    <TextView
+        android:id="@+id/textView7"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="28dp"
+        android:text="SoulFood"
+        android:textColor="#000000"
+        android:textSize="36sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</android.support.constraint.ConstraintLayout>
--- a/app/src/main/res/layout/activity_saved_playlists.xml
+++ b/app/src/main/res/layout/activity_saved_playlists.xml
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.example.soulfood_assignment2.SavedPlaylists">
+    <TextView
+        android:id="@+id/textView10"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginBottom="8dp"
+        android:text="Saved Playlists"
+        app:layout_constraintBottom_toTopOf="@+id/_dynamic"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.51" />
+    <ListView
+        android:id="@+id/listViewPlaylists"
+        android:layout_width="395dp"
+        android:layout_height="640dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="36dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView10" />
+</android.support.constraint.ConstraintLayout>
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -10,11 +10,7 @@
        android:id="@+id/factorySettings"
        android:layout_width="309dp"
        android:layout_height="41dp"
-        android:layout_marginStart="62dp"
+        android:layout_marginBottom="296dp"
-        android:layout_marginLeft="62dp"
-        android:layout_marginEnd="44dp"
-        android:layout_marginRight="44dp"
-        android:layout_marginBottom="50dp"
        android:text="Test"
        android:textColor="#000000"
        app:layout_constraintBottom_toBottomOf="parent"
@@ -42,11 +38,9 @@
        android:layout_height="25dp"
        android:layout_marginStart="10dp"
        android:layout_marginLeft="10dp"
-        android:layout_marginTop="80dp"
+        android:layout_marginTop="140dp"
        android:layout_marginEnd="22dp"
        android:layout_marginRight="22dp"
-        android:layout_marginBottom="478dp"
-        app:layout_constraintBottom_toTopOf="@+id/factorySettings"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toEndOf="@+id/textView12"
        app:layout_constraintTop_toBottomOf="@+id/textView11" />
@@ -57,15 +51,24 @@
        android:layout_height="wrap_content"
        android:layout_marginStart="32dp"
        android:layout_marginLeft="32dp"
-        android:layout_marginTop="80dp"
+        android:layout_marginTop="144dp"
        android:layout_marginEnd="60dp"
        android:layout_marginRight="60dp"
-        android:layout_marginBottom="484dp"
        android:text="Volume"
        android:textColor="#000000"
-        app:layout_constraintBottom_toTopOf="@+id/factorySettings"
        app:layout_constraintEnd_toStartOf="@+id/seekBar"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/textView11" />
+    <Button
+        android:id="@+id/homeScreenView"
+        android:layout_width="310dp"
+        android:layout_height="48dp"
+        android:layout_marginBottom="200dp"
+        android:onClick="homeScreenViewOnClick"
+        android:text="Back to home"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file